瀏覽代碼

Remove ugly bootstrapping - we don't need it now.

Jon Skeet 17 年之前
父節點
當前提交
b8b7d4fca3
共有 2 個文件被更改,包括 0 次插入18 次删除
  1. 0 14
      src/ProtocolBuffers/DescriptorProtos/PartialClasses.cs
  2. 0 4
      src/ProtocolBuffers/UnknownFieldSet.cs

+ 0 - 14
src/ProtocolBuffers/DescriptorProtos/PartialClasses.cs

@@ -35,20 +35,6 @@
 // IDescriptorProto
 // IDescriptorProto
 namespace Google.ProtocolBuffers.DescriptorProtos {
 namespace Google.ProtocolBuffers.DescriptorProtos {
 
 
-  // TODO(jonskeet): Find a better way of fixing this. It's needed in order to
-  // cope with unknown fields during initialization.
-  public partial class DescriptorProtoFile {
-    private static readonly bool initialized = false;
-
-    internal static bool Bootstrapping {
-      get { return !initialized; }
-    }
-
-    static DescriptorProtoFile() {
-      initialized = true;
-    }
-  }
-
   public partial class DescriptorProto : IDescriptorProto<MessageOptions> { }
   public partial class DescriptorProto : IDescriptorProto<MessageOptions> { }
   public partial class EnumDescriptorProto : IDescriptorProto<EnumOptions> { }
   public partial class EnumDescriptorProto : IDescriptorProto<EnumOptions> { }
   public partial class EnumValueDescriptorProto : IDescriptorProto<EnumValueOptions> { }
   public partial class EnumValueDescriptorProto : IDescriptorProto<EnumValueOptions> { }

+ 0 - 4
src/ProtocolBuffers/UnknownFieldSet.cs

@@ -472,10 +472,6 @@ namespace Google.ProtocolBuffers {
       internal bool MergeFieldFrom(CodedInputStream input, 
       internal bool MergeFieldFrom(CodedInputStream input, 
           ExtensionRegistry extensionRegistry, IBuilder builder, uint tag) {
           ExtensionRegistry extensionRegistry, IBuilder builder, uint tag) {
 
 
-        if (DescriptorProtoFile.Bootstrapping) {
-          return MergeFieldFrom(tag, input);
-        }
-
         MessageDescriptor type = builder.DescriptorForType;
         MessageDescriptor type = builder.DescriptorForType;
         if (type.Options.MessageSetWireFormat && tag == WireFormat.MessageSetTag.ItemStart) {
         if (type.Options.MessageSetWireFormat && tag == WireFormat.MessageSetTag.ItemStart) {
           MergeMessageSetExtensionFromCodedStream(input, extensionRegistry, builder);
           MergeMessageSetExtensionFromCodedStream(input, extensionRegistry, builder);