sdbusplus: replace message::variant with std::variant
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I2507d27d0dd7672a2a91c7e4f82a48229e9cecac
diff --git a/host-interface.cpp b/host-interface.cpp
index ca33b1e..5aa7806 100644
--- a/host-interface.cpp
+++ b/host-interface.cpp
@@ -26,8 +26,7 @@
{IPMI_CMD_OCC_RESET, Base::Host::Command::OCCReset}};
// Called at user request
-void Host::execute(Base::Host::Command command,
- sdbusplus::message::variant<uint8_t> data)
+void Host::execute(Base::Host::Command command, std::variant<uint8_t> data)
{
using namespace phosphor::logging;
diff --git a/host-interface.hpp b/host-interface.hpp
index c4d3500..05d76f6 100644
--- a/host-interface.hpp
+++ b/host-interface.hpp
@@ -39,8 +39,7 @@
* @param[in] command - Input command to execute
* @param[in] data - Data associated with the command
*/
- void execute(Command command,
- sdbusplus::message::variant<uint8_t> data) override;
+ void execute(Command command, std::variant<uint8_t> data) override;
private:
/** @brief sdbusplus DBus bus connection. */
diff --git a/oemhandler.cpp b/oemhandler.cpp
index 78a1e86..7204241 100644
--- a/oemhandler.cpp
+++ b/oemhandler.cpp
@@ -360,7 +360,7 @@
{
return IPMI_CC_UNSPECIFIED_ERROR;
}
- sdbusplus::message::variant<std::string> off =
+ std::variant<std::string> off =
"xyz.openbmc_project.State.Chassis.Transition.Off";
auto method = bus.new_method_call(service.c_str(), stateChassisPath,
propertiesIntf, "Set");
@@ -406,7 +406,7 @@
"the factory reset.");
return IPMI_CC_UNSPECIFIED_ERROR;
}
- sdbusplus::message::variant<std::string> reboot =
+ std::variant<std::string> reboot =
"xyz.openbmc_project.State.BMC.Transition.Reboot";
method = bus.new_method_call(service.c_str(), stateBmcPath, propertiesIntf,
"Set");