From a3ea9d120389d535164e42e45c07b539a398c6e1 Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Thu, 4 Feb 2016 07:05:49 +0000 Subject: 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.am') 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 \ -- cgit v1.2.3