diff options
| author | Vernon Mauery <vernon.mauery@linux.intel.com> | 2019-04-09 11:44:36 -0700 |
|---|---|---|
| committer | Vernon Mauery <vernon.mauery@linux.intel.com> | 2019-04-18 22:40:32 +0000 |
| commit | f442e119aed2dc87f320bf230ad39e7dc5c72524 (patch) | |
| tree | fe834d199e48249934b3c84aa92db536aea3ef25 /sensordatahandler.cpp | |
| parent | 5b2535f89023d0ea220ccc24200a9b51c142c08d (diff) | |
| download | phosphor-host-ipmid-f442e119aed2dc87f320bf230ad39e7dc5c72524.tar.gz phosphor-host-ipmid-f442e119aed2dc87f320bf230ad39e7dc5c72524.zip | |
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>
Diffstat (limited to 'sensordatahandler.cpp')
| -rw-r--r-- | sensordatahandler.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
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<bool>(value.second.assert); + result = result && std::get<bool>(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<bool>(value.second.deassert); + result = result && std::get<bool>(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<bool>(value.second.assert); + result = result && std::get<bool>(value.second.assert); } else if (deassertionSet.test(value.first)) { - result = - result && variant_ns::get<bool>(value.second.deassert); + result = result && std::get<bool>(value.second.deassert); } } if (valid) |
