From f442e119aed2dc87f320bf230ad39e7dc5c72524 Mon Sep 17 00:00:00 2001 From: Vernon Mauery Date: Tue, 9 Apr 2019 11:44:36 -0700 Subject: 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 --- sensordatahandler.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'sensordatahandler.cpp') diff --git a/sensordatahandler.cpp b/sensordatahandler.cpp index 1de1540..76dad69 100644 --- a/sensordatahandler.cpp +++ b/sensordatahandler.cpp @@ -17,8 +17,6 @@ namespace ipmi namespace sensor { -namespace variant_ns = sdbusplus::message::variant_ns; - using namespace phosphor::logging; using InternalFailure = sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure; @@ -340,8 +338,7 @@ ipmi_ret_t assertion(const SetSensorReadingReq& cmdData, const Info& sensorInfo) { return IPMI_CC_OK; } - result = - result && variant_ns::get(value.second.assert); + result = result && std::get(value.second.assert); valid = true; } else if (deassertionSet.test(value.first)) @@ -351,8 +348,7 @@ ipmi_ret_t assertion(const SetSensorReadingReq& cmdData, const Info& sensorInfo) { return IPMI_CC_OK; } - result = - result && variant_ns::get(value.second.deassert); + result = result && std::get(value.second.deassert); valid = true; } } @@ -361,13 +357,11 @@ ipmi_ret_t assertion(const SetSensorReadingReq& cmdData, const Info& sensorInfo) { if (assertionSet.test(value.first)) { - result = - result && variant_ns::get(value.second.assert); + result = result && std::get(value.second.assert); } else if (deassertionSet.test(value.first)) { - result = - result && variant_ns::get(value.second.deassert); + result = result && std::get(value.second.deassert); } } if (valid) -- cgit v1.2.1