diff options
author | Jon Skeet <skeet@pobox.com> | 2015-12-17 13:10:16 +0000 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2015-12-17 13:10:16 +0000 |
commit | afbc89a263d57bb2e36ce5f07b979c739bb2e8cd (patch) | |
tree | 266ac3f5d092795012ff8aa851184c883cce95ed /csharp/src/Google.Protobuf.Conformance | |
parent | 33106681a5e630e9f81cdec0f0d7f98901dfc70f (diff) | |
parent | adee6fe33250502a497cac6dc6b259e2936cdf93 (diff) | |
download | protobuf-afbc89a263d57bb2e36ce5f07b979c739bb2e8cd.tar.gz protobuf-afbc89a263d57bb2e36ce5f07b979c739bb2e8cd.tar.bz2 protobuf-afbc89a263d57bb2e36ce5f07b979c739bb2e8cd.zip |
Merge pull request #1049 from jskeet/any-format
Handle Any formatting for diagnostic purposes
Diffstat (limited to 'csharp/src/Google.Protobuf.Conformance')
-rw-r--r-- | csharp/src/Google.Protobuf.Conformance/Conformance.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/csharp/src/Google.Protobuf.Conformance/Conformance.cs b/csharp/src/Google.Protobuf.Conformance/Conformance.cs index 50ce1de4..f135d768 100644 --- a/csharp/src/Google.Protobuf.Conformance/Conformance.cs +++ b/csharp/src/Google.Protobuf.Conformance/Conformance.cs @@ -284,7 +284,7 @@ namespace Conformance { } public override string ToString() { - return pb::JsonFormatter.Default.Format(this); + return pb::JsonFormatter.ToDiagnosticString(this); } public void WriteTo(pb::CodedOutputStream output) { @@ -532,7 +532,7 @@ namespace Conformance { } public override string ToString() { - return pb::JsonFormatter.Default.Format(this); + return pb::JsonFormatter.ToDiagnosticString(this); } public void WriteTo(pb::CodedOutputStream output) { @@ -1544,7 +1544,7 @@ namespace Conformance { } public override string ToString() { - return pb::JsonFormatter.Default.Format(this); + return pb::JsonFormatter.ToDiagnosticString(this); } public void WriteTo(pb::CodedOutputStream output) { @@ -2343,7 +2343,7 @@ namespace Conformance { } public override string ToString() { - return pb::JsonFormatter.Default.Format(this); + return pb::JsonFormatter.ToDiagnosticString(this); } public void WriteTo(pb::CodedOutputStream output) { @@ -2471,7 +2471,7 @@ namespace Conformance { } public override string ToString() { - return pb::JsonFormatter.Default.Format(this); + return pb::JsonFormatter.ToDiagnosticString(this); } public void WriteTo(pb::CodedOutputStream output) { |