From 7cdf66e292e1ed6cbd9fd2b938e74c3d9e92d851 Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Thu, 6 Oct 2022 20:34:08 -0700 Subject: [PATCH] Sync from Piper @479479714 PROTOBUF_SYNC_PIPER --- src/google/protobuf/json/json.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/google/protobuf/json/json.cc b/src/google/protobuf/json/json.cc index ba6b3af868..6cbc0bb77c 100644 --- a/src/google/protobuf/json/json.cc +++ b/src/google/protobuf/json/json.cc @@ -40,14 +40,13 @@ #include "google/protobuf/util/type_resolver.h" #include "google/protobuf/stubs/status_macros.h" - // Must be included last. #include "google/protobuf/port_def.inc" - namespace google { namespace protobuf { namespace json { + absl::Status BinaryToJsonStream(google::protobuf::util::TypeResolver* resolver, const std::string& type_url, io::ZeroCopyInputStream* binary_input,