diff options
| author | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-02-04 06:43:13 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-02-04 06:43:13 -0800 |
| commit | c78222a366edf128e4361d32958dc96d0b4d89d8 (patch) | |
| tree | 2e35945c37206936e3f1fad318b5659a700b1b60 /csharp/src/Google.Protobuf/WellKnownTypes/Any.cs | |
| parent | eb1d156d74fc4742175d6c143e5747772e44a4bb (diff) | |
| parent | b6159965ec2c9988b28b4ea18891528690f2e4c4 (diff) | |
| download | protobuf-c78222a366edf128e4361d32958dc96d0b4d89d8.tar.gz protobuf-c78222a366edf128e4361d32958dc96d0b4d89d8.tar.bz2 protobuf-c78222a366edf128e4361d32958dc96d0b4d89d8.zip | |
Merge pull request #1210 from jskeet/rename-generatedcodeinfo
Rename GeneratedCodeInfo to GeneratedClrTypeInfo
Diffstat (limited to 'csharp/src/Google.Protobuf/WellKnownTypes/Any.cs')
| -rw-r--r-- | csharp/src/Google.Protobuf/WellKnownTypes/Any.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs index ff391fc0..d04fd970 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs @@ -29,8 +29,8 @@ namespace Google.Protobuf.WellKnownTypes { "bGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, - new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { - new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Any), global::Google.Protobuf.WellKnownTypes.Any.Parser, new[]{ "TypeUrl", "Value" }, null, null, null) + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Any), global::Google.Protobuf.WellKnownTypes.Any.Parser, new[]{ "TypeUrl", "Value" }, null, null, null) })); } #endregion |