diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2017-12-13 13:25:38 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-13 13:25:38 -0800 |
commit | 0a7120ac32e16d49a35abf18186c8c4db515dd02 (patch) | |
tree | 0c7798bdd38b8d80a7f80955274f0f145326e5f2 /src/google | |
parent | 5ce724bcebebb56914da6efc40b85c4c801e6fe1 (diff) | |
parent | 6c27550df09d7344c2aba15733f36109d80d00cf (diff) | |
download | protobuf-0a7120ac32e16d49a35abf18186c8c4db515dd02.tar.gz protobuf-0a7120ac32e16d49a35abf18186c8c4db515dd02.tar.bz2 protobuf-0a7120ac32e16d49a35abf18186c8c4db515dd02.zip |
Merge pull request #4037 from xfxyjwf/issue2880
Clarify default value behavior in JSON conversion.
Diffstat (limited to 'src/google')
-rw-r--r-- | src/google/protobuf/util/json_util.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/util/json_util.h b/src/google/protobuf/util/json_util.h index dee3ddba..b1c69813 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. |