From 6c27550df09d7344c2aba15733f36109d80d00cf Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Tue, 12 Dec 2017 15:11:40 -0800 Subject: [PATCH] Clarify default value behavior in JSON conversion. Make it clear default value is only omitted for proto3. --- src/google/protobuf/util/json_util.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/google/protobuf/util/json_util.h b/src/google/protobuf/util/json_util.h index dee3ddba99..b1c69813b8 100644 --- a/src/google/protobuf/util/json_util.h +++ b/src/google/protobuf/util/json_util.h @@ -56,10 +56,10 @@ struct JsonPrintOptions { // Whether to add spaces, line breaks and indentation to make the JSON output // easy to read. bool add_whitespace; - // Whether to always print primitive fields. By default primitive fields with - // default values will be omitted in JSON joutput. For example, an int32 field - // set to 0 will be omitted. Set this flag to true will override the default - // behavior and print primitive fields regardless of their values. + // Whether to always print primitive fields. By default proto3 primitive + // fields with default values will be omitted in JSON output. For example, an + // int32 field set to 0 will be omitted. Set this flag to true will override + // the default behavior and print primitive fields regardless of their values. bool always_print_primitive_fields; // Whether to always print enums as ints. By default they are rendered as // strings.