Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e324ce25 authored by Haibo Huang's avatar Haibo Huang
Browse files

[vkjson] Use new jsoncpp API 

Reader / StyledWriter are deprecated upstream

Bug: 170642246
Change-Id: If1b330ca0aef2866d1466e71c886cafea75fe894
parent 20fc78f5

vulkan/vkjson/vkjson.cc

+4 −4
Original line number Original line Diff line number Diff line
@@ -1196,10 +1196,10 @@ template <typename T> bool VkTypeFromJson(const std::string& json, 
                                          std::string* errors) {

                                          std::string* errors) {

  *t = T();

  *t = T();

  Json::Value object(Json::objectValue);

  Json::Value object(Json::objectValue);

  Json::Reader reader;

  Json::CharReaderBuilder builder;

  reader.parse(json, object, false);

  builder["collectComments"] = false;

  if (!object) {

  std::unique_ptr<Json::CharReader> reader(builder.newCharReader());

    if (errors) errors->assign(reader.getFormatedErrorMessages());

  if (!reader->parse(json.data(), json.data() + json.size(), &object, errors)) {

    return false;

    return false;

  }

  }

  return AsValue(&object, t);

  return AsValue(&object, t);