aboutsummaryrefslogtreecommitdiff
path: root/src/google
diff options
context:
space:
mode:
authorJon Skeet <skeet@pobox.com>2015-12-17 13:10:16 +0000
committerJon Skeet <skeet@pobox.com>2015-12-17 13:10:16 +0000
commitafbc89a263d57bb2e36ce5f07b979c739bb2e8cd (patch)
tree266ac3f5d092795012ff8aa851184c883cce95ed /src/google
parent33106681a5e630e9f81cdec0f0d7f98901dfc70f (diff)
parentadee6fe33250502a497cac6dc6b259e2936cdf93 (diff)
downloadprotobuf-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 'src/google')
-rw-r--r--src/google/protobuf/compiler/csharp/csharp_message.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_message.cc b/src/google/protobuf/compiler/csharp/csharp_message.cc
index 9c72043b..e0230a24 100644
--- a/src/google/protobuf/compiler/csharp/csharp_message.cc
+++ b/src/google/protobuf/compiler/csharp/csharp_message.cc
@@ -353,7 +353,7 @@ void MessageGenerator::GenerateFrameworkMethods(io::Printer* printer) {
printer->Print(
"public override string ToString() {\n"
- " return pb::JsonFormatter.Default.Format(this);\n"
+ " return pb::JsonFormatter.ToDiagnosticString(this);\n"
"}\n\n");
}