From 16b8693d636bdcbff58e7d184f37e3a06340965d Mon Sep 17 00:00:00 2001
From: Vernon Mauery <vernon.mauery@linux.intel.com>
Date: Wed, 1 May 2019 08:36:11 -0700
Subject: remove usage of sdbusplus::message::variant

sdbusplus has had its alias of std::variant in place for long
enough. This changes all ipmid references to use std::variant
directly instead of the sdbusplus alias.

Tested-by: building and running ipmid

Change-Id: Id5b4136d4589aa598815edd3ef4202e64a7698e2
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
---
 dcmihandler.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'dcmihandler.cpp')

diff --git a/dcmihandler.cpp b/dcmihandler.cpp
index de3d92b..f8498f5 100644
--- a/dcmihandler.cpp
+++ b/dcmihandler.cpp
@@ -13,7 +13,7 @@
 #include <phosphor-logging/elog-errors.hpp>
 #include <phosphor-logging/log.hpp>
 #include <sdbusplus/bus.hpp>
-#include <sdbusplus/message/types.hpp>
+#include <variant>
 #include <xyz/openbmc_project/Common/error.hpp>
 
 using namespace phosphor::logging;
@@ -85,7 +85,7 @@ uint32_t getPcap(sdbusplus::bus::bus& bus)
         log<level::ERR>("Error in getPcap prop");
         elog<InternalFailure>();
     }
-    sdbusplus::message::variant<uint32_t> pcap;
+    std::variant<uint32_t> pcap;
     reply.read(pcap);
 
     return std::get<uint32_t>(pcap);
@@ -106,7 +106,7 @@ bool getPcapEnabled(sdbusplus::bus::bus& bus)
         log<level::ERR>("Error in getPcapEnabled prop");
         elog<InternalFailure>();
     }
-    sdbusplus::message::variant<bool> pcapEnabled;
+    std::variant<bool> pcapEnabled;
     reply.read(pcapEnabled);
 
     return std::get<bool>(pcapEnabled);
@@ -120,7 +120,7 @@ void setPcap(sdbusplus::bus::bus& bus, const uint32_t powerCap)
                                       "org.freedesktop.DBus.Properties", "Set");
 
     method.append(PCAP_INTERFACE, POWER_CAP_PROP);
-    method.append(sdbusplus::message::variant<uint32_t>(powerCap));
+    method.append(std::variant<uint32_t>(powerCap));
 
     auto reply = bus.call(method);
 
@@ -139,7 +139,7 @@ void setPcapEnable(sdbusplus::bus::bus& bus, bool enabled)
                                       "org.freedesktop.DBus.Properties", "Set");
 
     method.append(PCAP_INTERFACE, POWER_CAP_ENABLE_PROP);
-    method.append(sdbusplus::message::variant<bool>(enabled));
+    method.append(std::variant<bool>(enabled));
 
     auto reply = bus.call(method);
 
@@ -205,7 +205,7 @@ std::string readAssetTag()
         elog<InternalFailure>();
     }
 
-    sdbusplus::message::variant<std::string> assetTag;
+    std::variant<std::string> assetTag;
     reply.read(assetTag);
 
     return std::get<std::string>(assetTag);
@@ -225,7 +225,7 @@ void writeAssetTag(const std::string& assetTag)
         (objectTree.begin()->first).c_str(), dcmi::propIntf, "Set");
     method.append(dcmi::assetTagIntf);
     method.append(dcmi::assetTagProp);
-    method.append(sdbusplus::message::variant<std::string>(assetTag));
+    method.append(std::variant<std::string>(assetTag));
 
     auto reply = bus.call(method);
     if (reply.is_method_error())
-- 
cgit v1.2.1