diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2017-03-29 14:32:48 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2017-03-29 14:33:05 -0700 |
| commit | d36c0c538a545fac5d9db6ba65c525246d4efa95 (patch) | |
| tree | 3fd29af0f137dfaf5df892723e60600f674392b3 /src/google/protobuf/util/json_util.cc | |
| parent | 4a0dd03e52e09332c8fd0f8f26a8e0ae9f911182 (diff) | |
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/util/json_util.cc')
| -rw-r--r-- | src/google/protobuf/util/json_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/util/json_util.cc b/src/google/protobuf/util/json_util.cc index 8595a881..c85f1899 100644 --- a/src/google/protobuf/util/json_util.cc +++ b/src/google/protobuf/util/json_util.cc @@ -84,7 +84,7 @@ util::Status BinaryToJsonStream(TypeResolver* resolver, converter::ProtoStreamObjectSource proto_source(&in_stream, resolver, type); proto_source.set_use_ints_for_enums(options.always_print_enums_as_ints); proto_source.set_preserve_proto_field_names( - options.preserve_proto_field_names); + options.preserve_proto_field_names); io::CodedOutputStream out_stream(json_output); converter::JsonObjectWriter json_writer(options.add_whitespace ? " " : "", &out_stream); @@ -92,7 +92,7 @@ util::Status BinaryToJsonStream(TypeResolver* resolver, converter::DefaultValueObjectWriter default_value_writer( resolver, type, &json_writer); default_value_writer.set_preserve_proto_field_names( - options.preserve_proto_field_names); + options.preserve_proto_field_names); return proto_source.WriteTo(&default_value_writer); } else { return proto_source.WriteTo(&json_writer); @@ -113,7 +113,7 @@ util::Status BinaryToJsonString(TypeResolver* resolver, namespace { class StatusErrorListener : public converter::ErrorListener { public: - StatusErrorListener() : status_(util::Status::OK) {} + StatusErrorListener() {} virtual ~StatusErrorListener() {} util::Status GetStatus() { return status_; } |