summaryrefslogtreecommitdiffstats
path: root/settings.cpp
diff options
context:
space:
mode:
authorVernon Mauery <vernon.mauery@linux.intel.com>2019-04-09 11:44:36 -0700
committerVernon Mauery <vernon.mauery@linux.intel.com>2019-04-18 22:40:32 +0000
commitf442e119aed2dc87f320bf230ad39e7dc5c72524 (patch)
treefe834d199e48249934b3c84aa92db536aea3ef25 /settings.cpp
parent5b2535f89023d0ea220ccc24200a9b51c142c08d (diff)
downloadphosphor-host-ipmid-master.tar.gz
phosphor-host-ipmid-master.zip
move variant to std namespaceHEADmaster
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 'settings.cpp')
-rw-r--r--settings.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/settings.cpp b/settings.cpp
index e8b8997..a51fa95 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -11,7 +11,6 @@ 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";
@@ -132,7 +131,7 @@ std::tuple<Path, OneTimeEnabled> setting(const Objects& objects,
sdbusplus::message::variant<bool> enabled;
reply.read(enabled);
- auto oneTimeEnabled = variant_ns::get<bool>(enabled);
+ auto oneTimeEnabled = std::get<bool>(enabled);
const Path& setting = oneTimeEnabled ? oneTimeSetting : regularSetting;
return std::make_tuple(setting, oneTimeEnabled);
}
OpenPOWER on IntegriCloud