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 /Makefile.am | |
| 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 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 188346fe..c7267e02 100644 --- a/Makefile.am +++ b/Makefile.am @@ -146,7 +146,7 @@ csharp_EXTRA_DIST= \ csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs \ csharp/src/Google.Protobuf/Reflection/FieldType.cs \ csharp/src/Google.Protobuf/Reflection/FileDescriptor.cs \ - csharp/src/Google.Protobuf/Reflection/GeneratedCodeInfo.cs \ + csharp/src/Google.Protobuf/Reflection/GeneratedClrTypeInfo.cs \ csharp/src/Google.Protobuf/Reflection/IDescriptor.cs \ csharp/src/Google.Protobuf/Reflection/IFieldAccessor.cs \ csharp/src/Google.Protobuf/Reflection/MapFieldAccessor.cs \ |