diff options
| author | Jon Skeet <jonskeet@google.com> | 2016-02-04 07:05:49 +0000 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2016-02-04 07:05:49 +0000 |
| commit | a3ea9d120389d535164e42e45c07b539a398c6e1 (patch) | |
| tree | 7f89000a6e653ab8af6899e30f3c2c1b3f8de925 /csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs | |
| parent | eb1d156d74fc4742175d6c143e5747772e44a4bb (diff) | |
| download | protobuf-a3ea9d120389d535164e42e45c07b539a398c6e1.tar.gz protobuf-a3ea9d120389d535164e42e45c07b539a398c6e1.tar.bz2 protobuf-a3ea9d120389d535164e42e45c07b539a398c6e1.zip | |
Rename GeneratedCodeInfo to GeneratedClrTypeInfo
Recently, descriptor.proto gained a GeneratedCodeInfo message, which means the generated code conflicts with our type.
Unfortunately this affects codegen as well, although this is a part of the public API which is very unlikely to affect hand-written code.
Generated code changes in next commit.
Diffstat (limited to 'csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs')
| -rw-r--r-- | csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs index f43803a6..f5798d1e 100644 --- a/csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs +++ b/csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs @@ -60,7 +60,7 @@ namespace Google.Protobuf.Reflection private readonly IList<FieldDescriptor> fieldsInNumberOrder; private readonly IDictionary<string, FieldDescriptor> jsonFieldMap; - internal MessageDescriptor(DescriptorProto proto, FileDescriptor file, MessageDescriptor parent, int typeIndex, GeneratedCodeInfo generatedCodeInfo) + internal MessageDescriptor(DescriptorProto proto, FileDescriptor file, MessageDescriptor parent, int typeIndex, GeneratedClrTypeInfo generatedCodeInfo) : base(file, file.ComputeFullName(parent, proto.Name), typeIndex) { Proto = proto; |