Adapt to google::protobuf::int64 type change and scoped_ptr removal

Protobuf 3.9.1 redefines google::protobuf::int64 from long long to
int64_t, which is sometimes long and sometimes long long.  Use
PRId64 to print it.

scoped_ptr has been removed, use std::unique_ptr instead.

Bug: 117607748
Test: m checkbuild
Change-Id: Idfcaba262c27cf2b895a0a6ded8394c8465547e8
Merged-In: Idfcaba262c27cf2b895a0a6ded8394c8465547e8

1 files changed, 2 insertions, 3 deletions

diff --git a/libjsonpb/parse/jsonpb.cpp b/libjsonpb/parse/jsonpb.cpp
index bd95dbdf..d7feb670 100644
--- a/libjsonpb/parse/jsonpb.cpp
+++ b/libjsonpb/parse/jsonpb.cpp
@@ -27,7 +27,6 @@ namespace jsonpb {
 
 using google::protobuf::DescriptorPool;
 using google::protobuf::Message;
-using google::protobuf::scoped_ptr;
 using google::protobuf::util::NewTypeResolverForDescriptorPool;
 using google::protobuf::util::TypeResolver;
 
@@ -38,7 +37,7 @@ std::string GetTypeUrl(const Message& message) {
 }
 
 ErrorOr<std::string> MessageToJsonString(const Message& message) {
-    scoped_ptr<TypeResolver> resolver(
+    std::unique_ptr<TypeResolver> resolver(
             NewTypeResolverForDescriptorPool(kTypeUrlPrefix, DescriptorPool::generated_pool()));
 
     google::protobuf::util::JsonOptions options;
@@ -56,7 +55,7 @@ ErrorOr<std::string> MessageToJsonString(const Message& message) {
 
 namespace internal {
 ErrorOr<std::monostate> JsonStringToMessage(const std::string& content, Message* message) {
-    scoped_ptr<TypeResolver> resolver(
+    std::unique_ptr<TypeResolver> resolver(
             NewTypeResolverForDescriptorPool(kTypeUrlPrefix, DescriptorPool::generated_pool()));
 
     std::string binary;