commit 87145c1f8cc7999ad43e23f95f87494b5cc20554
author Andrew Jeffery <andrew@aj.id.au> Tue Apr 12 22:29:34 2022 +0930
committer Ed Tanous <ed@tanous.net> Tue May 03 21:39:23 2022 +0000
tree 9bec9128e7dae9c9518a4288e1b6bb9714d9d1fd
parent 920a28117f1eb7622d4b3e25e5abda193516d897

PerformScan: Be explicit about dbusObject type in run()

Drop this verbose indirection through the mapped_type property.

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

src/PerformScan.cpp

diff --git a/src/PerformScan.cpp b/src/PerformScan.cpp
index 7b9ef1f..268e436 100644
--- a/src/PerformScan.cpp
+++ b/src/PerformScan.cpp
@@ -370,7 +370,7 @@
 
                 std::optional<std::string> replaceStr;
 
-                MapperGetSubTreeResponse::mapped_type emptyInterfaces;
+                DBusObject emptyInterfaces;
                 DBusInterface emptyInterface;
                 emptyInterfaces.emplace(std::string{}, emptyInterface);
 
@@ -382,8 +382,7 @@
                     // interface, such as if it was just TRUE, then
                     // templateCharReplace will just get passed in an empty
                     // map.
-                    const MapperGetSubTreeResponse::mapped_type* dbusObject =
-                        &emptyInterfaces;
+                    const DBusObject* dbusObject = &emptyInterfaces;
 
                     auto ifacesIt = allInterfaces.find(path);
                     if (ifacesIt != allInterfaces.end())