diff options
| author | Jon Skeet <jonskeet@google.com> | 2015-11-05 09:13:53 +0000 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2015-11-09 09:22:45 +0000 |
| commit | 284bb452e48a3cf3346f00b0ea5579d8fe854573 (patch) | |
| tree | 69fb9f4b6e11543f8121438522f4ef541837eade /csharp/src/Google.Protobuf.Conformance/Conformance.cs | |
| parent | 61a50b9e6b3c2898eb1446230f3ed74f9c8be7f9 (diff) | |
| download | protobuf-284bb452e48a3cf3346f00b0ea5579d8fe854573.tar.gz protobuf-284bb452e48a3cf3346f00b0ea5579d8fe854573.tar.bz2 protobuf-284bb452e48a3cf3346f00b0ea5579d8fe854573.zip | |
Generated code changes and manual changes for previous commit.
Diffstat (limited to 'csharp/src/Google.Protobuf.Conformance/Conformance.cs')
| -rw-r--r-- | csharp/src/Google.Protobuf.Conformance/Conformance.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/csharp/src/Google.Protobuf.Conformance/Conformance.cs b/csharp/src/Google.Protobuf.Conformance/Conformance.cs index 3ebaa4ef..3b8e3480 100644 --- a/csharp/src/Google.Protobuf.Conformance/Conformance.cs +++ b/csharp/src/Google.Protobuf.Conformance/Conformance.cs @@ -11,7 +11,7 @@ namespace Conformance { /// <summary>Holder for reflection information generated from conformance.proto</summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public static partial class Conformance { + public static partial class ConformanceReflection { #region Descriptor /// <summary>File descriptor for conformance.proto</summary> @@ -20,7 +20,7 @@ namespace Conformance { } private static pbr::FileDescriptor descriptor; - static Conformance() { + static ConformanceReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChFjb25mb3JtYW5jZS5wcm90bxILY29uZm9ybWFuY2UijQEKEkNvbmZvcm1h", @@ -176,7 +176,7 @@ namespace Conformance { public static pb::MessageParser<ConformanceRequest> Parser { get { return _parser; } } public static pbr::MessageDescriptor Descriptor { - get { return global::Conformance.Conformance.Descriptor.MessageTypes[0]; } + get { return global::Conformance.ConformanceReflection.Descriptor.MessageTypes[0]; } } pbr::MessageDescriptor pb::IMessage.Descriptor { @@ -368,7 +368,7 @@ namespace Conformance { public static pb::MessageParser<ConformanceResponse> Parser { get { return _parser; } } public static pbr::MessageDescriptor Descriptor { - get { return global::Conformance.Conformance.Descriptor.MessageTypes[1]; } + get { return global::Conformance.ConformanceReflection.Descriptor.MessageTypes[1]; } } pbr::MessageDescriptor pb::IMessage.Descriptor { @@ -645,7 +645,7 @@ namespace Conformance { public static pb::MessageParser<TestAllTypes> Parser { get { return _parser; } } public static pbr::MessageDescriptor Descriptor { - get { return global::Conformance.Conformance.Descriptor.MessageTypes[2]; } + get { return global::Conformance.ConformanceReflection.Descriptor.MessageTypes[2]; } } pbr::MessageDescriptor pb::IMessage.Descriptor { @@ -2418,7 +2418,7 @@ namespace Conformance { public static pb::MessageParser<ForeignMessage> Parser { get { return _parser; } } public static pbr::MessageDescriptor Descriptor { - get { return global::Conformance.Conformance.Descriptor.MessageTypes[3]; } + get { return global::Conformance.ConformanceReflection.Descriptor.MessageTypes[3]; } } pbr::MessageDescriptor pb::IMessage.Descriptor { |