commit abf2add6a35aaf42ba60c4ae955a4d8925b13b19
author Ed Tanous <ed.tanous@intel.com> Tue Jan 22 16:40:12 2019 -0800
committer Ed Tanous <ed.tanous@intel.com> Sat Feb 09 01:54:39 2019 +0000
tree fe3e8aadb5bb92455cf504d50d7a99478b35ec67
parent 734bfe90949b230b1d3e061522f45903c10c7b08

bmcweb: move variant usage to std namespace

Change-Id: I9d7069668f91f2ac72d2f4a440f63e0e85dd5269
Signed-off-by: Ed Tanous <ed.tanous@intel.com>

redfish-core/lib/systems.hpp

diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp
index 3d7c931..e24a077 100644
--- a/redfish-core/lib/systems.hpp
+++ b/redfish-core/lib/systems.hpp
@@ -18,6 +18,7 @@
 #include <boost/container/flat_map.hpp>
 #include <node.hpp>
 #include <utils/json_utils.hpp>
+#include <variant>
 
 namespace redfish
 {
@@ -87,8 +88,7 @@
                                      &property : propertiesList)
                             {
                                 const std::string *value =
-                                    sdbusplus::message::variant_ns::get_if<
-                                        std::string>(&property.second);
+                                    std::get_if<std::string>(&property.second);
                                 if (value != nullptr)
                                 {
                                     aResp->res.jsonValue[property.first] =
@@ -355,8 +355,7 @@
                                 if (property.first == "Asserted")
                                 {
                                     const bool *asserted =
-                                        sdbusplus::message::variant_ns::get_if<
-                                            bool>(&property.second);
+                                        std::get_if<bool>(&property.second);
                                     if (nullptr != asserted)
                                     {
                                         callback(*asserted, aResp);
@@ -399,8 +398,7 @@
                 if (property.first == "State")
                 {
                     const std::string *s =
-                        sdbusplus::message::variant_ns::get_if<std::string>(
-                            &property.second);
+                        std::get_if<std::string>(&property.second);
                     if (nullptr != s)
                     {
                         BMCWEB_LOG_DEBUG << "Identify Led State: " << *s;
@@ -444,9 +442,8 @@
 {
     BMCWEB_LOG_DEBUG << "Get host information.";
     crow::connections::systemBus->async_method_call(
-        [aResp{std::move(aResp)}](
-            const boost::system::error_code ec,
-            const sdbusplus::message::variant<std::string> &hostState) {
+        [aResp{std::move(aResp)}](const boost::system::error_code ec,
+                                  const std::variant<std::string> &hostState) {
             if (ec)
             {
                 BMCWEB_LOG_DEBUG << "DBUS response error " << ec;
@@ -454,8 +451,7 @@
                 return;
             }
 
-            const std::string *s =
-                sdbusplus::message::variant_ns::get_if<std::string>(&hostState);
+            const std::string *s = std::get_if<std::string>(&hostState);
             BMCWEB_LOG_DEBUG << "Host state: " << *s;
             if (s != nullptr)
             {
@@ -598,7 +594,7 @@
                 "/xyz/openbmc_project/state/chassis0",
                 "org.freedesktop.DBus.Properties", "Set",
                 "xyz.openbmc_project.State.Chassis", "RequestedPowerTransition",
-                sdbusplus::message::variant<std::string>{
+                std::variant<std::string>{
                     "xyz.openbmc_project.State.Chassis.Transition.Off"});
             return;
         }
@@ -640,7 +636,7 @@
             "/xyz/openbmc_project/state/host0",
             "org.freedesktop.DBus.Properties", "Set",
             "xyz.openbmc_project.State.Host", "RequestedHostTransition",
-            sdbusplus::message::variant<std::string>{command});
+            std::variant<std::string>{command});
     }
 };
 
@@ -813,7 +809,7 @@
                 "/xyz/openbmc_project/led/groups/enclosure_identify",
                 "org.freedesktop.DBus.Properties", "Set",
                 "xyz.openbmc_project.Led.Group", "Asserted",
-                sdbusplus::message::variant<bool>(
+                std::variant<bool>(
                     (dbusLedState ==
                              "xyz.openbmc_project.Led.Physical.Action.Off"
                          ? false
@@ -836,7 +832,7 @@
                 "/xyz/openbmc_project/led/physical/identify",
                 "org.freedesktop.DBus.Properties", "Set",
                 "xyz.openbmc_project.Led.Physical", "State",
-                sdbusplus::message::variant<std::string>(dbusLedState));
+                std::variant<std::string>(dbusLedState));
         }
     }
 };