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

Commit 96938a78 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[vkjson] Use new jsoncpp API" am: e9b81a40 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1607278

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f11203909d59d9fe9824a9eab1ffe6e84a52dce
parents e00110e1 e9b81a40

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);