commit a244984b094e2faa882b717d13d0fa77461b924d
author Andrew Jeffery <andrew@aj.id.au> Thu Apr 14 15:35:51 2022 +0930
committer Ed Tanous <ed@tanous.net> Fri May 06 21:29:37 2022 +0000
tree b3d8e8e3f09f2aa2e3f133abda2f9f48e4c88873
parent ba3c50cf0269e4a8caef7d64ab5aa8ddba5df12d

PerformScan: Use nlohmann::json::is_{string,array}() for type checks

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: I7f632623fa589147dcc72f5e8483e48251f8a60e

src/PerformScan.cpp

diff --git a/src/PerformScan.cpp b/src/PerformScan.cpp
index 7799596..b22ada7 100644
--- a/src/PerformScan.cpp
+++ b/src/PerformScan.cpp
@@ -301,17 +301,17 @@
 static bool extractExposeActionRecordNames(std::vector<std::string>& matches,
                                            nlohmann::json::iterator& keyPair)
 {
-    if (keyPair.value().type() == nlohmann::json::value_t::string)
+    if (keyPair.value().is_string())
     {
         matches.emplace_back(keyPair.value());
         return true;
     }
 
-    if (keyPair.value().type() == nlohmann::json::value_t::array)
+    if (keyPair.value().is_array())
     {
         for (const auto& value : keyPair.value())
         {
-            if (value.type() != nlohmann::json::value_t::string)
+            if (!value.is_string())
             {
                 std::cerr << "Value is invalid type " << value << "\n";
                 break;