diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2018-09-07 16:15:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 16:15:38 -0700 |
| commit | f9d8138376765d229a32635c9209061e4e4aed8c (patch) | |
| tree | 50719686fd7262f405c9bda8694d6c72e7c038b8 /src/google/protobuf/util/json_util.cc | |
| parent | 2e7563f40ec7f901ae8ae1cc749d701fa07e211d (diff) | |
| parent | e53be9bce4556cf0d13e24f1a25a7d75f663144f (diff) | |
| download | protobuf-f9d8138376765d229a32635c9209061e4e4aed8c.tar.gz protobuf-f9d8138376765d229a32635c9209061e4e4aed8c.tar.bz2 protobuf-f9d8138376765d229a32635c9209061e4e4aed8c.zip | |
Merge pull request #5109 from haberman/integrate
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/util/json_util.cc')
| -rw-r--r-- | src/google/protobuf/util/json_util.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/google/protobuf/util/json_util.cc b/src/google/protobuf/util/json_util.cc index bf82fa7c..19e20a47 100644 --- a/src/google/protobuf/util/json_util.cc +++ b/src/google/protobuf/util/json_util.cc @@ -184,6 +184,8 @@ util::Status JsonToBinaryStream(TypeResolver* resolver, StatusErrorListener listener; converter::ProtoStreamObjectWriter::Options proto_writer_options; proto_writer_options.ignore_unknown_fields = options.ignore_unknown_fields; + proto_writer_options.ignore_unknown_enum_values = + options.ignore_unknown_fields; converter::ProtoStreamObjectWriter proto_writer(resolver, type, &sink, &listener, proto_writer_options); @@ -215,8 +217,7 @@ util::Status JsonToBinaryString(TypeResolver* resolver, namespace { const char* kTypeUrlPrefix = "type.googleapis.com"; TypeResolver* generated_type_resolver_ = NULL; -GOOGLE_PROTOBUF_NAMESPACE_ID::internal::once_flag - generated_type_resolver_init_; +PROTOBUF_NAMESPACE_ID::internal::once_flag generated_type_resolver_init_; string GetTypeUrl(const Message& message) { return string(kTypeUrlPrefix) + "/" + message.GetDescriptor()->full_name(); @@ -231,8 +232,8 @@ void InitGeneratedTypeResolver() { } TypeResolver* GetGeneratedTypeResolver() { - GOOGLE_PROTOBUF_NAMESPACE_ID::internal::call_once( - generated_type_resolver_init_, InitGeneratedTypeResolver); + PROTOBUF_NAMESPACE_ID::internal::call_once(generated_type_resolver_init_, + InitGeneratedTypeResolver); return generated_type_resolver_; } } // namespace |