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/update_service.hpp

diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp
index d5ecf24..5d5b3ea 100644
--- a/redfish-core/lib/update_service.hpp
+++ b/redfish-core/lib/update_service.hpp
@@ -18,6 +18,7 @@
 #include "node.hpp"
 
 #include <boost/container/flat_map.hpp>
+#include <variant>
 
 namespace redfish
 {
@@ -69,7 +70,7 @@
             "xyz.openbmc_project.Software.BMC.Updater", objPath,
             "org.freedesktop.DBus.Properties", "Set",
             "xyz.openbmc_project.Software.Activation", "RequestedActivation",
-            sdbusplus::message::variant<std::string>(
+            std::variant<std::string>(
                 "xyz.openbmc_project.Software.Activation.RequestedActivations."
                 "Active"));
     }
@@ -125,8 +126,7 @@
             }
             std::vector<std::pair<
                 std::string,
-                std::vector<std::pair<
-                    std::string, sdbusplus::message::variant<std::string>>>>>
+                std::vector<std::pair<std::string, std::variant<std::string>>>>>
                 interfacesProperties;
 
             sdbusplus::message::object_path objPath;
@@ -260,8 +260,7 @@
                                 }
 
                                 const std::string *swActivationStatus =
-                                    sdbusplus::message::variant_ns::get_if<
-                                        std::string>(&activation);
+                                    std::get_if<std::string>(&activation);
                                 if (swActivationStatus == nullptr)
                                 {
                                     messages::internalError(asyncResp->res);
@@ -401,8 +400,7 @@
                                 return;
                             }
                             const std::string *swInvPurpose =
-                                sdbusplus::message::variant_ns::get_if<
-                                    std::string>(&it->second);
+                                std::get_if<std::string>(&it->second);
                             if (swInvPurpose == nullptr)
                             {
                                 BMCWEB_LOG_DEBUG
@@ -427,8 +425,7 @@
                             BMCWEB_LOG_DEBUG << "Version found!";
 
                             const std::string *version =
-                                sdbusplus::message::variant_ns::get_if<
-                                    std::string>(&it->second);
+                                std::get_if<std::string>(&it->second);
 
                             if (version == nullptr)
                             {