commit a3ea9d120389d535164e42e45c07b539a398c6e1
author Jon Skeet <jonskeet@google.com> Thu Feb 04 07:05:49 2016 +0000
committer Jon Skeet <jonskeet@google.com> Thu Feb 04 07:05:49 2016 +0000
tree 7f89000a6e653ab8af6899e30f3c2c1b3f8de925
parent eb1d156d74fc4742175d6c143e5747772e44a4bb

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.

Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 188346f..c7267e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -146,7 +146,7 @@
   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                  \