Tidying up, and a couple of extra tests.

3 files changed, 3 insertions, 6 deletions

diff --git a/csharp/ProtocolBuffers/CodedInputStream.cs b/csharp/ProtocolBuffers/CodedInputStream.cs
index d9dbc217..fd6f1de7 100644
--- a/csharp/ProtocolBuffers/CodedInputStream.cs
+++ b/csharp/ProtocolBuffers/CodedInputStream.cs
@@ -102,7 +102,7 @@ namespace Google.ProtocolBuffers {
     }
     #endregion
 
-    #region Uncategorised (TODO: Fix this!)
+    #region Validation
     /// <summary>
     /// Verifies that the last call to ReadTag() returned the given tag value.
     /// This is used to verify that a nested group ended with the correct
diff --git a/csharp/ProtocolBuffers/DynamicMessage.cs b/csharp/ProtocolBuffers/DynamicMessage.cs
index 9690981e..f0f4cde1 100644
--- a/csharp/ProtocolBuffers/DynamicMessage.cs
+++ b/csharp/ProtocolBuffers/DynamicMessage.cs
@@ -8,7 +8,6 @@ namespace Google.ProtocolBuffers {
 
   /// <summary>
   /// An implementation of IMessage that can represent arbitrary types, given a MessageaDescriptor.
-  /// TODO: Implement appropriate generics.
   /// </summary>
   public class DynamicMessage : AbstractMessage<DynamicMessage, DynamicMessage.Builder> {
 
diff --git a/csharp/ProtocolBuffers/ExtendableBuilder.cs b/csharp/ProtocolBuffers/ExtendableBuilder.cs
index b55d4b99..3cc43944 100644
--- a/csharp/ProtocolBuffers/ExtendableBuilder.cs
+++ b/csharp/ProtocolBuffers/ExtendableBuilder.cs
@@ -95,8 +95,7 @@ namespace Google.ProtocolBuffers {
       set {
         if (field.IsExtension) {
           ExtendableMessage<TMessage, TBuilder> message = MessageBeingBuilt;
-          // TODO(jonskeet): Figure out how to call this!
-          // message.VerifyExtensionContainingType(field);
+          message.VerifyContainingType(field);
           message.Extensions[field, index] = value;
         } else {
           base[field, index] = value;
@@ -109,8 +108,7 @@ namespace Google.ProtocolBuffers {
       set {
         if (field.IsExtension) {
           ExtendableMessage<TMessage, TBuilder> message = MessageBeingBuilt;
-          // TODO(jonskeet): Figure out how to call this!
-          // message.VerifyExtensionContainingType(field);
+          message.VerifyContainingType(field);
           message.Extensions[field] = value;
         } else {
           base[field] = value;