diff options
author | Jon Skeet <skeet@pobox.com> | 2008-12-15 10:58:12 +0000 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2008-12-15 10:58:12 +0000 |
commit | b8b7d4fca3c04f26ab9a37b821a9dadecb4cf97e (patch) | |
tree | 7750d5cb1fd912575322a3023edbd6d5e75f13e9 /src | |
parent | 3f225111007e39c5d34c76d015c23596bf934658 (diff) | |
download | protobuf-b8b7d4fca3c04f26ab9a37b821a9dadecb4cf97e.tar.gz protobuf-b8b7d4fca3c04f26ab9a37b821a9dadecb4cf97e.tar.bz2 protobuf-b8b7d4fca3c04f26ab9a37b821a9dadecb4cf97e.zip |
Remove ugly bootstrapping - we don't need it now.
Diffstat (limited to 'src')
-rw-r--r-- | src/ProtocolBuffers/DescriptorProtos/PartialClasses.cs | 14 | ||||
-rw-r--r-- | src/ProtocolBuffers/UnknownFieldSet.cs | 4 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/ProtocolBuffers/DescriptorProtos/PartialClasses.cs b/src/ProtocolBuffers/DescriptorProtos/PartialClasses.cs index 92f5fd05..6a4b1430 100644 --- a/src/ProtocolBuffers/DescriptorProtos/PartialClasses.cs +++ b/src/ProtocolBuffers/DescriptorProtos/PartialClasses.cs @@ -35,20 +35,6 @@ // IDescriptorProto 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 EnumDescriptorProto : IDescriptorProto<EnumOptions> { } public partial class EnumValueDescriptorProto : IDescriptorProto<EnumValueOptions> { } diff --git a/src/ProtocolBuffers/UnknownFieldSet.cs b/src/ProtocolBuffers/UnknownFieldSet.cs index a457fdf3..ecae53ce 100644 --- a/src/ProtocolBuffers/UnknownFieldSet.cs +++ b/src/ProtocolBuffers/UnknownFieldSet.cs @@ -472,10 +472,6 @@ namespace Google.ProtocolBuffers { internal bool MergeFieldFrom(CodedInputStream input, ExtensionRegistry extensionRegistry, IBuilder builder, uint tag) { - if (DescriptorProtoFile.Bootstrapping) { - return MergeFieldFrom(tag, input); - } - MessageDescriptor type = builder.DescriptorForType; if (type.Options.MessageSetWireFormat && tag == WireFormat.MessageSetTag.ItemStart) { MergeMessageSetExtensionFromCodedStream(input, extensionRegistry, builder); |