From e324ce25cd65c0e949efee72f2ce804f8dd52d84 Mon Sep 17 00:00:00 2001
From: Haibo Huang <hhb@google.com>
Date: Thu, 25 Feb 2021 10:37:51 -0800
Subject: [vkjson] Use new jsoncpp API

Reader / StyledWriter are deprecated upstream

Bug: 170642246
Change-Id: If1b330ca0aef2866d1466e71c886cafea75fe894
---
 vulkan/vkjson/vkjson.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vulkan/vkjson/vkjson.cc b/vulkan/vkjson/vkjson.cc
index bfc240e4dd..a513239061 100644
--- a/vulkan/vkjson/vkjson.cc
+++ b/vulkan/vkjson/vkjson.cc
@@ -1196,10 +1196,10 @@ template <typename T> bool VkTypeFromJson(const std::string& json,
                                           std::string* errors) {
   *t = T();
   Json::Value object(Json::objectValue);
-  Json::Reader reader;
-  reader.parse(json, object, false);
-  if (!object) {
-    if (errors) errors->assign(reader.getFormatedErrorMessages());
+  Json::CharReaderBuilder builder;
+  builder["collectComments"] = false;
+  std::unique_ptr<Json::CharReader> reader(builder.newCharReader());
+  if (!reader->parse(json.data(), json.data() + json.size(), &object, errors)) {
     return false;
   }
   return AsValue(&object, t);
-- 
cgit v1.2.3-59-g8ed1b