diff options
| author |  Jon Skeet <jonskeet@google.com> | 2015-11-19 17:14:23 +0000 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2015-11-22 16:30:36 +0000 |
| commit | a2667aafd80b0b37e529a94be3ce4df66d8ad6cb (patch) | |
| tree | 331da99dc0dc12fc13f395f3dfd32dc4ab726078 /csharp/src/Google.Protobuf/Reflection | |
| parent | 72ec33676fd40ccfe719ace162fcf859ae9251bc (diff) | |
Generated code changes for previous commit (basically InternalBuildGeneratedFileFrom => FromGeneratedCode)
Diffstat (limited to 'csharp/src/Google.Protobuf/Reflection')
| -rw-r--r-- | csharp/src/Google.Protobuf/Reflection/Descriptor.cs | 2 | ||||
| -rw-r--r-- | csharp/src/Google.Protobuf/Reflection/EnumDescriptor.cs | 4 | ||||
| -rw-r--r-- | csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs index 34bc82ec..03685322 100644 --- a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs +++ b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs @@ -135,7 +135,7 @@ namespace Google.Protobuf.Reflection { "X2NvbW1lbnRzGAYgAygJQlgKE2NvbS5nb29nbGUucHJvdG9idWZCEERlc2Ny", "aXB0b3JQcm90b3NIAVoKZGVzY3JpcHRvcqICA0dQQqoCGkdvb2dsZS5Qcm90", "b2J1Zi5SZWZsZWN0aW9u")); - descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.FileDescriptorSet), global::Google.Protobuf.Reflection.FileDescriptorSet.Parser, new[]{ "File" }, null, null, null), diff --git a/csharp/src/Google.Protobuf/Reflection/EnumDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/EnumDescriptor.cs index 57abbbff..c732c93a 100644 --- a/csharp/src/Google.Protobuf/Reflection/EnumDescriptor.cs +++ b/csharp/src/Google.Protobuf/Reflection/EnumDescriptor.cs @@ -45,11 +45,11 @@ namespace Google.Protobuf.Reflection private readonly IList<EnumValueDescriptor> values; private readonly Type clrType; - internal EnumDescriptor(EnumDescriptorProto proto, FileDescriptor file, MessageDescriptor parent, int index, Type generatedType) + internal EnumDescriptor(EnumDescriptorProto proto, FileDescriptor file, MessageDescriptor parent, int index, Type clrType) : base(file, file.ComputeFullName(parent, proto.Name), index) { this.proto = proto; - this.clrType = generatedType; + this.clrType = clrType; containingType = parent; if (proto.Value.Count == 0) diff --git a/csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs index 769ac3d5..d1732b2e 100644 --- a/csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs +++ b/csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs @@ -187,7 +187,7 @@ namespace Google.Protobuf.Reflection /// </summary> /// <param name="name">The unqualified name of the field (e.g. "foo").</param> /// <returns>The field's descriptor, or null if not found.</returns> - public FieldDescriptor FindFieldByName(String name) =>File.DescriptorPool.FindSymbol<FieldDescriptor>(FullName + "." + name); + public FieldDescriptor FindFieldByName(String name) => File.DescriptorPool.FindSymbol<FieldDescriptor>(FullName + "." + name); /// <summary> /// Finds a field by field number. |