summaryrefslogtreecommitdiffstats
path: root/storagehandler.cpp
diff options
context:
space:
mode:
authorVernon Mauery <vernon.mauery@linux.intel.com>2019-05-01 08:36:11 -0700
committerVernon Mauery <vernon.mauery@linux.intel.com>2019-05-14 15:46:08 +0000
commit16b8693d636bdcbff58e7d184f37e3a06340965d (patch)
treec15134a636e9450004c989e73d6aa1245707a02e /storagehandler.cpp
parent23b7021c00b0a52cd7837c9d51cfa7fa52dc9776 (diff)
downloadphosphor-host-ipmid-16b8693d636bdcbff58e7d184f37e3a06340965d.tar.gz
phosphor-host-ipmid-16b8693d636bdcbff58e7d184f37e3a06340965d.zip
remove usage of sdbusplus::message::variant
sdbusplus has had its alias of std::variant in place for long enough. This changes all ipmid references to use std::variant directly instead of the sdbusplus alias. Tested-by: building and running ipmid Change-Id: Id5b4136d4589aa598815edd3ef4202e64a7698e2 Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
Diffstat (limited to 'storagehandler.cpp')
-rw-r--r--storagehandler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/storagehandler.cpp b/storagehandler.cpp
index 6f20835..88a0aa1 100644
--- a/storagehandler.cpp
+++ b/storagehandler.cpp
@@ -19,9 +19,9 @@
#include <ipmid/utils.hpp>
#include <phosphor-logging/elog-errors.hpp>
#include <phosphor-logging/log.hpp>
-#include <sdbusplus/message/types.hpp>
#include <sdbusplus/server.hpp>
#include <string>
+#include <variant>
#include <xyz/openbmc_project/Common/error.hpp>
void register_netfn_storage_functions() __attribute__((constructor));
@@ -488,7 +488,7 @@ ipmi_ret_t ipmi_storage_get_sel_time(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
{
sdbusplus::bus::bus bus{ipmid_get_sd_bus_connection()};
auto service = ipmi::getService(bus, TIME_INTERFACE, HOST_TIME_PATH);
- sdbusplus::message::variant<uint64_t> value;
+ std::variant<uint64_t> value;
// Get host time
auto method = bus.new_method_call(service.c_str(), HOST_TIME_PATH,
@@ -558,7 +558,7 @@ ipmi_ret_t ipmi_storage_set_sel_time(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
{
sdbusplus::bus::bus bus{ipmid_get_sd_bus_connection()};
auto service = ipmi::getService(bus, TIME_INTERFACE, HOST_TIME_PATH);
- sdbusplus::message::variant<uint64_t> value{usec.count()};
+ std::variant<uint64_t> value{usec.count()};
// Set host time
auto method = bus.new_method_call(service.c_str(), HOST_TIME_PATH,
OpenPOWER on IntegriCloud