commit 305ff8b133fc633e707dc0830a3a4e78622384c3
author Patrick Williams <patrick@stwcx.xyz> Wed May 13 11:17:39 2020 -0500
committer Patrick Williams <patrick@stwcx.xyz> Wed May 13 11:19:10 2020 -0500
tree 253d5b43e23928bcf4e5df2b54d3eb00ebe2ec63
parent 65f8cd379d2aa0078352714f9a6bb513cc5e7b17

sdbusplus: remove deprecated variant_ns

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

occ_finder.cpp

diff --git a/occ_finder.cpp b/occ_finder.cpp
index a9f98d6..c6926fd 100644
--- a/occ_finder.cpp
+++ b/occ_finder.cpp
@@ -50,7 +50,7 @@
     sdbusplus::message::variant<T> value;
     reply.read(value);
 
-    return sdbusplus::message::variant_ns::get<T>(value);
+    return std::get<T>(value);
 }
 
 std::vector<std::string> get(sdbusplus::bus::bus& bus)

occ_pass_through.cpp

diff --git a/occ_pass_through.cpp b/occ_pass_through.cpp
index a92d824..9c585d0 100644
--- a/occ_pass_through.cpp
+++ b/occ_pass_through.cpp
@@ -146,7 +146,7 @@
     if (propertyMap != msgData.end())
     {
         // Extract the OccActive property
-        if (sdbusplus::message::variant_ns::get<bool>(propertyMap->second))
+        if (std::get<bool>(propertyMap->second))
         {
             occActive = true;
         }

powercap.cpp

diff --git a/powercap.cpp b/powercap.cpp
index a04584f..6f46d34 100644
--- a/powercap.cpp
+++ b/powercap.cpp
@@ -85,7 +85,7 @@
     sdbusplus::message::variant<uint32_t> pcap;
     reply.read(pcap);
 
-    return sdbusplus::message::variant_ns::get<uint32_t>(pcap);
+    return std::get<uint32_t>(pcap);
 }
 
 bool PowerCap::getPcapEnabled()
@@ -107,7 +107,7 @@
     sdbusplus::message::variant<bool> pcapEnabled;
     reply.read(pcapEnabled);
 
-    return sdbusplus::message::variant_ns::get<bool>(pcapEnabled);
+    return std::get<bool>(pcapEnabled);
 }
 
 std::string PowerCap::getPcapFilename(const fs::path& path)
@@ -180,8 +180,7 @@
     auto valPropMap = msgData.find(POWER_CAP_PROP);
     if (valPropMap != msgData.end())
     {
-        pcap =
-            sdbusplus::message::variant_ns::get<uint32_t>(valPropMap->second);
+        pcap = std::get<uint32_t>(valPropMap->second);
         pcapEnabled = getPcapEnabled();
     }
     else
@@ -189,8 +188,7 @@
         valPropMap = msgData.find(POWER_CAP_ENABLE_PROP);
         if (valPropMap != msgData.end())
         {
-            pcapEnabled =
-                sdbusplus::message::variant_ns::get<bool>(valPropMap->second);
+            pcapEnabled = std::get<bool>(valPropMap->second);
             pcap = getPcap();
         }
         else