Move variant usage to std
Since sdbusplus now uses std, it's cleaner just to
use the variant type directly not behind the namespace.
This was primarily done with sed commands
Tested-by: It builds
Change-Id: I87a90a2942cfc6da312cb0e045cce7cd40a644e5
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/src/HwmonTempMain.cpp b/src/HwmonTempMain.cpp
index 0a19636..430793a 100644
--- a/src/HwmonTempMain.cpp
+++ b/src/HwmonTempMain.cpp
@@ -138,10 +138,8 @@
continue;
}
- if (sdbusplus::message::variant_ns::get<uint64_t>(
- configurationBus->second) != bus ||
- sdbusplus::message::variant_ns::get<uint64_t>(
- configurationAddress->second) != addr)
+ if (std::get<uint64_t>(configurationBus->second) != bus ||
+ std::get<uint64_t>(configurationAddress->second) != addr)
{
continue;
}
@@ -162,9 +160,7 @@
<< deviceName << "\n";
continue;
}
- std::string sensorName =
- sdbusplus::message::variant_ns::get<std::string>(
- findSensorName->second);
+ std::string sensorName = std::get<std::string>(findSensorName->second);
// on rescans, only update sensors we were signaled by
auto findSensor = sensors.find(sensorName);
if (!firstScan && findSensor != sensors.end())
@@ -203,8 +199,7 @@
continue;
}
- sensorName = sdbusplus::message::variant_ns::get<std::string>(
- findSecondName->second);
+ sensorName = std::get<std::string>(findSecondName->second);
sensors[sensorName] = std::make_unique<HwmonTempSensor>(
directory.string() + "/temp2_input", sensorType, objectServer,
dbusConnection, io, sensorName,