diff options
| author | Haibo Huang <hhb@google.com> | 2021-02-25 11:05:43 -0800 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2021-03-01 23:08:57 +0000 |
| commit | ec831121778b9aa25e024968eeabfb95ca37d1fb (patch) | |
| tree | c0b7f316b258226d7750c9a1cf9e2bca784cf00b /power-libperfmgr | |
| parent | 32f3a338abb0dfe42b4f299e45fc363e7eb0cb3b (diff) | |
| download | pixel-ec831121778b9aa25e024968eeabfb95ca37d1fb.tar.gz | |
[libperfmgr] Use new jsoncpp API
Reader / StyledWriter are deprecated upstream
Bug: 170642246
Change-Id: Idda98ab653ea64a6e305382ff519c7005ac8f80b
Diffstat (limited to 'power-libperfmgr')
| -rw-r--r-- | power-libperfmgr/libperfmgr/HintManager.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/power-libperfmgr/libperfmgr/HintManager.cc b/power-libperfmgr/libperfmgr/HintManager.cc index 1b546ae6..cf9f8296 100644 --- a/power-libperfmgr/libperfmgr/HintManager.cc +++ b/power-libperfmgr/libperfmgr/HintManager.cc @@ -151,9 +151,11 @@ std::vector<std::unique_ptr<Node>> HintManager::ParseNodes( std::set<std::string> nodes_name_parsed; std::set<std::string> nodes_path_parsed; Json::Value root; - Json::Reader reader; + Json::CharReaderBuilder builder; + std::unique_ptr<Json::CharReader> reader(builder.newCharReader()); + std::string errorMessage; - if (!reader.parse(json_doc, root)) { + if (!reader->parse(&*json_doc.begin(), &*json_doc.end(), &root, &errorMessage)) { LOG(ERROR) << "Failed to parse JSON config"; return nodes_parsed; } @@ -296,9 +298,11 @@ std::map<std::string, std::vector<NodeAction>> HintManager::ParseActions( // function starts std::map<std::string, std::vector<NodeAction>> actions_parsed; Json::Value root; - Json::Reader reader; + Json::CharReaderBuilder builder; + std::unique_ptr<Json::CharReader> reader(builder.newCharReader()); + std::string errorMessage; - if (!reader.parse(json_doc, root)) { + if (!reader->parse(&*json_doc.begin(), &*json_doc.end(), &root, &errorMessage)) { LOG(ERROR) << "Failed to parse JSON config"; return actions_parsed; } |