commit fbe4fb6e69e9e7d400cd174ea8140f43a9642356
author Jiaqing Zhao <jiaqing.zhao@intel.com> Mon Jun 20 12:32:22 2022 +0800
committer Ed Tanous <ed@tanous.net> Mon Jun 27 23:50:43 2022 +0000
tree f6972c6e91e50973a25cb45fc621c86cd6150823
parent 4d94272fe54c147974f86788092bbbdd950406aa

memory: Use dbus::utility::DBusPropertiesMap::value_type

Both dimmPropToHex() and getPersistentMemoryProperties() uses a custom
type for DBusPropertiesMap entry, use the value_type instead.

Tested:
Build pass.

Change-Id: Iffce0bec160d1bae684164db13994bf34ef8594f
Signed-off-by: Jiaqing Zhao <jiaqing.zhao@intel.com>

redfish-core/lib/memory.hpp

diff --git a/redfish-core/lib/memory.hpp b/redfish-core/lib/memory.hpp
index 8996082..c4a2ef4 100644
--- a/redfish-core/lib/memory.hpp
+++ b/redfish-core/lib/memory.hpp
@@ -139,10 +139,11 @@
     return "";
 }
 
-inline void dimmPropToHex(
-    const std::shared_ptr<bmcweb::AsyncResp>& aResp, const char* key,
-    const std::pair<std::string, dbus::utility::DbusVariantType>& property,
-    const nlohmann::json::json_pointer& jsonPtr)
+inline void
+    dimmPropToHex(const std::shared_ptr<bmcweb::AsyncResp>& aResp,
+                  const char* key,
+                  const dbus::utility::DBusPropertiesMap::value_type& property,
+                  const nlohmann::json::json_pointer& jsonPtr)
 {
     const uint16_t* value = std::get_if<uint16_t>(&property.second);
     if (value == nullptr)
@@ -156,7 +157,7 @@
 
 inline void getPersistentMemoryProperties(
     const std::shared_ptr<bmcweb::AsyncResp>& aResp,
-    const std::pair<std::string, dbus::utility::DbusVariantType>& property,
+    const dbus::utility::DBusPropertiesMap::value_type& property,
     const nlohmann::json::json_pointer& jsonPtr)
 {
     if (property.first == "ModuleManufacturerID")