diff options
11 files changed, 88 insertions, 85 deletions
diff --git a/src/AddressBook/AddressBookProtos.cs b/src/AddressBook/AddressBookProtos.cs index 5c69ace6..468f5a5b 100644 --- a/src/AddressBook/AddressBookProtos.cs +++ b/src/AddressBook/AddressBookProtos.cs @@ -357,7 +357,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook { } } static PhoneNumber() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.Examples.AddressBook.AddressBookProtos.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.Examples.AddressBook.AddressBookProtos.Descriptor, null); } } @@ -707,7 +707,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook { } } static Person() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.Examples.AddressBook.AddressBookProtos.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.Examples.AddressBook.AddressBookProtos.Descriptor, null); } } @@ -949,7 +949,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook { } } static AddressBook() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.Examples.AddressBook.AddressBookProtos.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.Examples.AddressBook.AddressBookProtos.Descriptor, null); } } diff --git a/src/ProtoGen/MessageGenerator.cs b/src/ProtoGen/MessageGenerator.cs index 53859231..6dc786c1 100644 --- a/src/ProtoGen/MessageGenerator.cs +++ b/src/ProtoGen/MessageGenerator.cs @@ -140,8 +140,11 @@ namespace Google.ProtocolBuffers.ProtoGen { // Force the static initialization code for the file to run, since it may // initialize static variables declared in this class. writer.WriteLine("static {0}() {{", ClassName); - // Note that the variable is needed just so we can access the property - writer.WriteLine(" pbd::FileDescriptor descriptor = {0}.Descriptor;", DescriptorUtil.GetFullUmbrellaClassName(Descriptor)); + // We call object.ReferenceEquals() just to make it a valid statement on its own. + // Another option would be GetType(), but that causes problems in DescriptorProtoFile, + // where the bootstrapping is somewhat recursive - type initializers call + // each other, effectively. We temporarily see Descriptor as null. + writer.WriteLine(" object.ReferenceEquals({0}.Descriptor, null);", DescriptorUtil.GetFullUmbrellaClassName(Descriptor)); writer.WriteLine("}"); writer.Outdent(); diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs index 5d567225..56d7e364 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs @@ -346,7 +346,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static OptionsMessage() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCSharpOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCSharpOptionsProtoFile.Descriptor, null); } } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs index d603c89b..64fc2a57 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs @@ -604,7 +604,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestMessageWithCustomOptions() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } @@ -777,7 +777,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static CustomOptionFooRequest() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } @@ -950,7 +950,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static CustomOptionFooResponse() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } @@ -1133,7 +1133,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static DummyMessageContainingEnum() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } @@ -1306,7 +1306,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static DummyMessageInvalidAsOptionType() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } @@ -1479,7 +1479,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static CustomOptionMinIntegerValues() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } @@ -1652,7 +1652,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static CustomOptionMaxIntegerValues() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } @@ -1825,7 +1825,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static CustomOptionOtherValues() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } @@ -1998,7 +1998,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static SettingRealsFromPositiveInts() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } @@ -2171,7 +2171,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static SettingRealsFromNegativeInts() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } @@ -2390,7 +2390,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static ComplexOptionType1() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } @@ -2630,7 +2630,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static ComplexOptionType4() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } @@ -2961,7 +2961,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static ComplexOptionType2() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } @@ -3199,7 +3199,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static ComplexOptionType5() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } @@ -3458,7 +3458,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static ComplexOptionType3() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } @@ -3672,7 +3672,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static ComplexOpt6() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } @@ -3845,7 +3845,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static VariousComplexOptions() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestCustomOptionsProtoFile.Descriptor, null); } } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs index 5ee90650..8f1542ab 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs @@ -360,7 +360,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestEmbedOptimizedForSize() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestEmbedOptimizeForProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestEmbedOptimizeForProtoFile.Descriptor, null); } } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs index 16068968..4181f8ff 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs @@ -270,7 +270,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static ImportMessage() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestImportProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestImportProtoFile.Descriptor, null); } } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs index cd1ca898..6a03016b 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs @@ -268,7 +268,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static TestMessageSet() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.Descriptor, null); } } @@ -505,7 +505,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestMessageSetContainer() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.Descriptor, null); } } @@ -721,7 +721,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestMessageSetExtension1() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.Descriptor, null); } } @@ -938,7 +938,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestMessageSetExtension2() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.Descriptor, null); } } @@ -1220,7 +1220,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static Item() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.Descriptor, null); } } @@ -1440,7 +1440,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static RawMessageSet() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.Descriptor, null); } } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs index 4b5eb7c8..a0648ed2 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs @@ -253,7 +253,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestOptimizedForSize() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestOptimizeForProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestOptimizeForProtoFile.Descriptor, null); } } @@ -384,7 +384,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestRequiredOptimizedForSize() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestOptimizeForProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestOptimizeForProtoFile.Descriptor, null); } } @@ -533,7 +533,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestOptionalOptimizedForSize() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestOptimizeForProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestOptimizeForProtoFile.Descriptor, null); } } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs index ff0874b9..a09952e1 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs @@ -1160,7 +1160,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static NestedMessage() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -1374,7 +1374,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static OptionalGroup() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -1588,7 +1588,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static RepeatedGroup() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -5214,7 +5214,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestAllTypes() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -5428,7 +5428,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static ForeignMessage() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -5606,7 +5606,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static TestAllExtensions() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -5820,7 +5820,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static OptionalGroup_extension() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -6034,7 +6034,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static RepeatedGroup_extension() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -7567,7 +7567,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestRequired() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -7917,7 +7917,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestRequiredForeign() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -8154,7 +8154,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestForeignNested() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -8327,7 +8327,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static TestEmptyMessage() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -8505,7 +8505,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static TestEmptyMessageWithExtensions() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -8760,7 +8760,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestReallyLargeTagNumber() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -9038,7 +9038,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestRecursiveMessage() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -9275,7 +9275,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestMutualRecursionA() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -9553,7 +9553,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestMutualRecursionB() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -9791,7 +9791,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static Foo() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -10005,7 +10005,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static Bar() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -10328,7 +10328,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestDupFieldNumber() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -10650,7 +10650,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static NestedMessage() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -10868,7 +10868,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestNestedMessageHasBits() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -11698,7 +11698,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestCamelCaseFieldNames() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -12001,7 +12001,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestFieldOrderings() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -12428,7 +12428,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestExtremeDefaultValues() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -13591,7 +13591,7 @@ namespace Google.ProtocolBuffers.TestProtos { } } static TestPackedTypes() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -13769,7 +13769,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static TestPackedExtensions() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -13942,7 +13942,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static FooRequest() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -14115,7 +14115,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static FooResponse() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -14288,7 +14288,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static BarRequest() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } @@ -14461,7 +14461,7 @@ namespace Google.ProtocolBuffers.TestProtos { } static BarResponse() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, null); } } diff --git a/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs b/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs index 902435fc..e451213f 100644 --- a/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs +++ b/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs @@ -445,7 +445,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static CSharpFileOptions() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.CSharpOptions.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.CSharpOptions.Descriptor, null); } } @@ -660,7 +660,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static CSharpFieldOptions() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.CSharpOptions.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.CSharpOptions.Descriptor, null); } } diff --git a/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs b/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs index 0839bd0a..07598ce6 100644 --- a/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs +++ b/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs @@ -458,7 +458,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static FileDescriptorSet() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -1119,7 +1119,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static FileDescriptorProto() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -1398,7 +1398,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static ExtensionRange() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -2003,7 +2003,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static DescriptorProto() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -2582,7 +2582,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static FieldDescriptorProto() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -2933,7 +2933,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static EnumDescriptorProto() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -3256,7 +3256,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static EnumValueDescriptorProto() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -3607,7 +3607,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static ServiceDescriptorProto() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -3973,7 +3973,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static MethodDescriptorProto() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -4404,7 +4404,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static FileOptions() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -4692,7 +4692,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static MessageOptions() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -5122,7 +5122,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static FieldOptions() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -5369,7 +5369,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static EnumOptions() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -5616,7 +5616,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static EnumValueOptions() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -5863,7 +5863,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static ServiceOptions() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -6110,7 +6110,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static MethodOptions() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -6392,7 +6392,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static NamePart() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } @@ -6825,7 +6825,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos { } } static UninterpretedOption() { - pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor; + object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, null); } } |