Convert variant usage to std interface
This is just a refactoring to use the c++17 std::variant interfaces
instead of the mapbox::variant specific ones. We should be able to use
mapbox::variant and std::variant interchangeably now.
Tested:
Built against sdbusplus with mapbox::variant and sbusplus using
std::variant. Both variant compile and test out.
Change-Id: I6fbaad3d12dd34968db6a10f3d74a65e07d0f0cc
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/ipmid.cpp b/ipmid.cpp
index e19eda0..2d48bfe 100644
--- a/ipmid.cpp
+++ b/ipmid.cpp
@@ -25,12 +25,14 @@
#include <phosphor-logging/log.hpp>
#include <sdbusplus/bus.hpp>
#include <sdbusplus/bus/match.hpp>
+#include <sdbusplus/message/types.hpp>
#include <sdbusplus/timer.hpp>
#include <vector>
#include <xyz/openbmc_project/Control/Security/RestrictionMode/server.hpp>
using namespace phosphor::logging;
namespace sdbusRule = sdbusplus::bus::match::rules;
+namespace variant_ns = sdbusplus::message::variant_ns;
sd_bus* bus = NULL;
sd_bus_slot* ipmid_slot = NULL;
@@ -380,8 +382,8 @@
}
sdbusplus::message::variant<std::string> result;
resp.read(result);
- auto restrictionMode =
- RestrictionMode::convertModesFromString(result.get<std::string>());
+ auto restrictionMode = RestrictionMode::convertModesFromString(
+ variant_ns::get<std::string>(result));
if (RestrictionMode::Modes::Whitelist == restrictionMode)
{
restricted_mode = true;