diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-21 00:31:04 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-21 00:34:19 -0800 |
| commit | d21780841734326d8a7653710f4f23b5366c4447 (patch) | |
| tree | 25df44708c81059a3e1c7025e12b734cc80ee3f4 /csharp/src/Google.Protobuf.Conformance/Conformance.cs | |
| parent | 1e2fece3e01b8e079b4f6930306377a9332a2ddb (diff) | |
| parent | b27f2893b2a118b4e3bfcd23d32114dbdd4e6d9b (diff) | |
| download | protobuf-d21780841734326d8a7653710f4f23b5366c4447.tar.gz protobuf-d21780841734326d8a7653710f4f23b5366c4447.tar.bz2 protobuf-d21780841734326d8a7653710f4f23b5366c4447.zip | |
Merge branch master into v3.0.0-beta-2
Diffstat (limited to 'csharp/src/Google.Protobuf.Conformance/Conformance.cs')
| -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) { |