summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVernon Mauery <vernon.mauery@linux.intel.com>2018-10-15 16:06:18 -0700
committerVernon Mauery <vernon.mauery@linux.intel.com>2018-11-06 15:44:28 -0800
commita34c2ab27d7ee8dfe661e02e7dadc56ff707db80 (patch)
tree1fdd55382f3fcabc8c1f5e85a47e857ad8f115cf
parentf41a5542d25ec7f924b597b607d664681381161a (diff)
downloadphosphor-net-ipmid-a34c2ab27d7ee8dfe661e02e7dadc56ff707db80.tar.gz
phosphor-net-ipmid-a34c2ab27d7ee8dfe661e02e7dadc56ff707db80.zip
netipmid: use std variant interface
Update code to remove mapbox-style interface usages. Tested-by: run ipmitool to start a remote connection. See that sessions can be started, same as before change. Change-Id: Ifc1a30069b6dc4e2d3706e1ca93f6b965552a051 Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
-rw-r--r--settings.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/settings.cpp b/settings.cpp
index 2b6915c..bbe8611 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -2,6 +2,7 @@
#include <phosphor-logging/elog-errors.hpp>
#include <phosphor-logging/log.hpp>
+#include <sdbusplus/message/types.hpp>
#include <xyz/openbmc_project/Common/error.hpp>
namespace settings
@@ -9,6 +10,7 @@ namespace settings
using namespace phosphor::logging;
using namespace sdbusplus::xyz::openbmc_project::Common::Error;
+namespace variant_ns = sdbusplus::message::variant_ns;
constexpr auto mapperService = "xyz.openbmc_project.ObjectMapper";
constexpr auto mapperPath = "/xyz/openbmc_project/object_mapper";
@@ -130,7 +132,7 @@ std::tuple<Path, OneTimeEnabled> setting(const Objects& objects,
sdbusplus::message::variant<bool> enabled;
reply.read(enabled);
- auto oneTimeEnabled = enabled.get<bool>();
+ auto oneTimeEnabled = variant_ns::get<bool>(enabled);
const Path& setting = oneTimeEnabled ? oneTimeSetting : regularSetting;
return std::make_tuple(setting, oneTimeEnabled);
}
OpenPOWER on IntegriCloud