commit e883fb8ba6f5b3ef55e8de9e404516d6d0600d8e
author Patrick Williams <patrick@stwcx.xyz> Wed May 13 11:38:55 2020 -0500
committer Patrick Williams <patrick@stwcx.xyz> Wed May 13 11:38:55 2020 -0500
tree 81fb005154ca5cf798887e1802e0dd5d2cf6acfe
parent 2a3d9f5c2be91c370225e8547f62466f49b50025

sdbusplus: remove deprecated variant_ns

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

activation.cpp

diff --git a/activation.cpp b/activation.cpp
index ab76420..cd4b367 100644
--- a/activation.cpp
+++ b/activation.cpp
@@ -386,8 +386,7 @@
 
             sdbusplus::message::variant<std::string> result;
             reply.read(result);
-            auto applyTime =
-                sdbusplus::message::variant_ns::get<std::string>(result);
+            auto applyTime = std::get<std::string>(result);
             if (applyTime == applyTimeImmediate)
             {
                 return true;

item_updater.cpp

diff --git a/item_updater.cpp b/item_updater.cpp
index 7fe69e4..4e2ca45 100644
--- a/item_updater.cpp
+++ b/item_updater.cpp
@@ -42,7 +42,6 @@
     using VersionPurpose = SVersion::VersionPurpose;
     using VersionClass = phosphor::software::manager::Version;
     namespace mesg = sdbusplus::message;
-    namespace variant_ns = mesg::variant_ns;
 
     mesg::object_path objPath;
     auto purpose = VersionPurpose::Unknown;
@@ -62,7 +61,7 @@
                 if (property.first == "Purpose")
                 {
                     auto value = SVersion::convertVersionPurposeFromString(
-                        variant_ns::get<std::string>(property.second));
+                        std::get<std::string>(property.second));
                     if (value == VersionPurpose::BMC ||
 #ifdef HOST_BIOS_UPGRADE
                         value == VersionPurpose::Host ||
@@ -74,7 +73,7 @@
                 }
                 else if (property.first == "Version")
                 {
-                    version = variant_ns::get<std::string>(property.second);
+                    version = std::get<std::string>(property.second);
                 }
             }
         }
@@ -84,7 +83,7 @@
             {
                 if (property.first == "Path")
                 {
-                    filePath = variant_ns::get<std::string>(property.second);
+                    filePath = std::get<std::string>(property.second);
                 }
             }
         }