commit 1b6b96c570fdf7ca5c643f3d0776581656e78070
author Ed Tanous <ed.tanous@intel.com> Fri Nov 30 11:35:41 2018 -0800
committer Ed Tanous <ed.tanous@intel.com> Mon Dec 10 12:54:40 2018 -0800
tree d96338cf9f95ea763e4fb6570d83e4d1808d3f41
parent 789a6a317b51abba38cf064dd5ee2abd051d02bf

Remove custom version of getPtr

Now that sdbusplus variant supports std::get_if, we can remove our
custom, mapbox namespaced implementation that does the same thing.

Change-Id: I854c473003e28e41dd45dba08ca683433f1c1774
Signed-off-by: Ed Tanous <ed.tanous@intel.com>

redfish-core/lib/cpudimm.hpp

diff --git a/redfish-core/lib/cpudimm.hpp b/redfish-core/lib/cpudimm.hpp
index 6001d63..ef73150 100644
--- a/redfish-core/lib/cpudimm.hpp
+++ b/redfish-core/lib/cpudimm.hpp
@@ -93,7 +93,8 @@
                 return;
             }
             const uint16_t *coresCount =
-                mapbox::getPtr<const uint16_t>(coresCountProperty->second);
+                sdbusplus::message::variant_ns::get_if<uint16_t>(
+                    &coresCountProperty->second);
             if (coresCount == nullptr)
             {
                 // Important property not in desired type
@@ -123,7 +124,8 @@
                 {
                     aResp->res.jsonValue["Manufacturer"] = property.second;
                     const std::string *value =
-                        mapbox::getPtr<const std::string>(property.second);
+                        sdbusplus::message::variant_ns::get_if<std::string>(
+                            &property.second);
                     if (value != nullptr)
                     {
                         // Otherwise would be unexpected.
@@ -224,7 +226,8 @@
                 return;
             }
             const uint32_t *memorySize =
-                mapbox::getPtr<const uint32_t>(memorySizeProperty->second);
+                sdbusplus::message::variant_ns::get_if<uint32_t>(
+                    &memorySizeProperty->second);
             if (memorySize == nullptr)
             {
                 // Important property not in desired type
@@ -253,7 +256,8 @@
                 else if (property.first == "MemoryType")
                 {
                     const auto *value =
-                        mapbox::getPtr<const std::string>(property.second);
+                        sdbusplus::message::variant_ns::get_if<std::string>(
+                            &property.second);
                     if (value != nullptr)
                     {
                         aResp->res.jsonValue["MemoryDeviceType"] = *value;