commit ef0efbc402a0a4bbc237361e18ab9fe070c4acdd
author Patrick Williams <patrick@stwcx.xyz> Wed May 13 11:26:51 2020 -0500
committer Patrick Williams <patrick@stwcx.xyz> Wed May 13 11:26:51 2020 -0500
tree 95c587015c5a9667690f34f63b8db10803e34c14
parent dd14c0f75d9af7783afb3e9e124ca5c015a8609b

sdbusplus: remove deprecated variant_ns

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Id44aa42872ecddf18bf75db92369681942dfbc5c

src/storagecommands.cpp

diff --git a/src/storagecommands.cpp b/src/storagecommands.cpp
index 3c11372..4dd6b72 100644
--- a/src/storagecommands.cpp
+++ b/src/storagecommands.cpp
@@ -38,7 +38,6 @@
 constexpr static const size_t maxFruSdrNameSize = 16;
 static constexpr int sensorMapUpdatePeriod = 2;
 using SensorMap = std::map<std::string, std::map<std::string, DbusVariant>>;
-namespace variant_ns = sdbusplus::message::variant_ns;
 
 using ManagedObjectSensor =
     std::map<sdbusplus::message::object_path,
@@ -216,10 +215,8 @@
             continue;
         }
 
-        uint8_t fruBus =
-            sdbusplus::message::variant_ns::get<uint32_t>(busFind->second);
-        uint8_t fruAddr =
-            sdbusplus::message::variant_ns::get<uint32_t>(addrFind->second);
+        uint8_t fruBus = std::get<uint32_t>(busFind->second);
+        uint8_t fruAddr = std::get<uint32_t>(addrFind->second);
 
         uint8_t fruHash = 0;
         // Need to revise this strategy for dev id
@@ -481,13 +478,11 @@
                          {
                              return false;
                          }
-                         if (sdbusplus::message::variant_ns::get<uint32_t>(
-                                 findBus->second) != bus)
+                         if (std::get<uint32_t>(findBus->second) != bus)
                          {
                              return false;
                          }
-                         if (sdbusplus::message::variant_ns::get<uint32_t>(
-                                 findAddress->second) != address)
+                         if (std::get<uint32_t>(findAddress->second) != address)
                          {
                              return false;
                          }
@@ -502,13 +497,11 @@
     auto findBoardName = fruData->find("PRODUCT_PRODUCT_NAME");
     if (findProductName != fruData->end())
     {
-        name = sdbusplus::message::variant_ns::get<std::string>(
-            findProductName->second);
+        name = std::get<std::string>(findProductName->second);
     }
     else if (findBoardName != fruData->end())
     {
-        name = sdbusplus::message::variant_ns::get<std::string>(
-            findBoardName->second);
+        name = std::get<std::string>(findBoardName->second);
     }
     else
     {
@@ -715,12 +708,12 @@
     double min = -127;
     if (maxObject != sensorObject->second.end())
     {
-        max = variant_ns::visit(VariantToDoubleVisitor(), maxObject->second);
+        max = std::visit(VariantToDoubleVisitor(), maxObject->second);
     }
 
     if (minObject != sensorObject->second.end())
     {
-        min = variant_ns::visit(VariantToDoubleVisitor(), minObject->second);
+        min = std::visit(VariantToDoubleVisitor(), minObject->second);
     }
 
     int16_t mValue;