commit f442e119aed2dc87f320bf230ad39e7dc5c72524
author Vernon Mauery <vernon.mauery@linux.intel.com> Tue Apr 09 11:44:36 2019 -0700
committer Vernon Mauery <vernon.mauery@linux.intel.com> Thu Apr 18 22:40:32 2019 +0000
tree fe834d199e48249934b3c84aa92db536aea3ef25
parent 5b2535f89023d0ea220ccc24200a9b51c142c08d

move variant to std namespace

sdbusplus::message::variant_ns has been std for a while now. This moves
ipmid away from sdbusplus::message::variant_ns to directly use
std::variant.

Tested-by: built, compiles, and runs the same as before.

Change-Id: I8caa945f31c926c2721319f001b9d7f83fd3f1b7
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>

dcmihandler.cpp

diff --git a/dcmihandler.cpp b/dcmihandler.cpp
index 3188585..edbca8f 100644
--- a/dcmihandler.cpp
+++ b/dcmihandler.cpp
@@ -54,7 +54,6 @@
 constexpr auto SENSOR_SCALE_PROP = "Scale";
 
 using namespace phosphor::logging;
-namespace variant_ns = sdbusplus::message::variant_ns;
 
 namespace dcmi
 {
@@ -89,7 +88,7 @@
     sdbusplus::message::variant<uint32_t> pcap;
     reply.read(pcap);
 
-    return variant_ns::get<uint32_t>(pcap);
+    return std::get<uint32_t>(pcap);
 }
 
 bool getPcapEnabled(sdbusplus::bus::bus& bus)
@@ -110,7 +109,7 @@
     sdbusplus::message::variant<bool> pcapEnabled;
     reply.read(pcapEnabled);
 
-    return variant_ns::get<bool>(pcapEnabled);
+    return std::get<bool>(pcapEnabled);
 }
 
 void setPcap(sdbusplus::bus::bus& bus, const uint32_t powerCap)
@@ -209,7 +208,7 @@
     sdbusplus::message::variant<std::string> assetTag;
     reply.read(assetTag);
 
-    return variant_ns::get<std::string>(assetTag);
+    return std::get<std::string>(assetTag);
 }
 
 void writeAssetTag(const std::string& assetTag)
@@ -244,7 +243,7 @@
     auto value = ipmi::getDbusProperty(bus, service, networkConfigObj,
                                        networkConfigIntf, hostNameProp);
 
-    return variant_ns::get<std::string>(value);
+    return std::get<std::string>(value);
 }
 
 bool getDHCPEnabled()
@@ -258,7 +257,7 @@
     auto value = ipmi::getDbusProperty(bus, service, ethernetObj.first,
                                        ethernetIntf, "DHCPEnabled");
 
-    return variant_ns::get<bool>(value);
+    return std::get<bool>(value);
 }
 
 bool getDHCPOption(std::string prop)
@@ -268,7 +267,7 @@
     auto service = ipmi::getService(bus, dhcpIntf, dhcpObj);
     auto value = ipmi::getDbusProperty(bus, service, dhcpObj, dhcpIntf, prop);
 
-    return variant_ns::get<bool>(value);
+    return std::get<bool>(value);
 }
 
 void setDHCPOption(std::string prop, bool value)
@@ -834,16 +833,15 @@
     sdbusplus::bus::bus bus{ipmid_get_sd_bus_connection()};
     auto result = ipmi::getAllDbusProperties(
         bus, dbusService, dbusPath, "xyz.openbmc_project.Sensor.Value");
-    auto temperature = sdbusplus::message::variant_ns::visit(
-        ipmi::VariantToDoubleVisitor(), result.at("Value"));
+    auto temperature =
+        std::visit(ipmi::VariantToDoubleVisitor(), result.at("Value"));
     double absTemp = std::abs(temperature);
 
     auto findFactor = result.find("Scale");
     double factor = 0.0;
     if (findFactor != result.end())
     {
-        factor = sdbusplus::message::variant_ns::visit(
-            ipmi::VariantToDoubleVisitor(), findFactor->second);
+        factor = std::visit(ipmi::VariantToDoubleVisitor(), findFactor->second);
     }
     double scale = std::pow(10, factor);
 
@@ -1084,8 +1082,8 @@
         // Read the sensor value and scale properties
         auto properties = ipmi::getAllDbusProperties(bus, service, objectPath,
                                                      SENSOR_VALUE_INTF);
-        auto value = variant_ns::get<int64_t>(properties[SENSOR_VALUE_PROP]);
-        auto scale = variant_ns::get<int64_t>(properties[SENSOR_SCALE_PROP]);
+        auto value = std::get<int64_t>(properties[SENSOR_VALUE_PROP]);
+        auto scale = std::get<int64_t>(properties[SENSOR_SCALE_PROP]);
 
         // Power reading needs to be scaled with the Scale value using the
         // formula Value * 10^Scale.