commit a41d282ae016b9efd44f061c6bd60137564d6747
author Patrick Williams <patrick@stwcx.xyz> Wed May 13 17:57:23 2020 -0500
committer Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com> Thu May 14 07:50:56 2020 +0000
tree 0259d439343d86ed3bb2bf60034a62cb65957199
parent 5ebebeff1f8234f67da4ae8817d7c9c4531fb76b

sdbusplus: replace message::variant with std::variant

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I7b04e16b91dbb6eb229cb2d0d528c56f6b2ea0ba

fault-monitor/fru-fault-monitor.cpp

diff --git a/fault-monitor/fru-fault-monitor.cpp b/fault-monitor/fru-fault-monitor.cpp
index 955540c..7b03733 100644
--- a/fault-monitor/fru-fault-monitor.cpp
+++ b/fault-monitor/fru-fault-monitor.cpp
@@ -30,7 +30,7 @@
 
 using AssociationList =
     std::vector<std::tuple<std::string, std::string, std::string>>;
-using Attributes = sdbusplus::message::variant<bool, AssociationList>;
+using Attributes = std::variant<bool, AssociationList>;
 using PropertyName = std::string;
 using PropertyMap = std::map<PropertyName, Attributes>;
 using InterfaceName = std::string;
@@ -126,7 +126,7 @@
     method.append("xyz.openbmc_project.Led.Group");
     method.append("Asserted");
 
-    method.append(sdbusplus::message::variant<bool>(assert));
+    method.append(std::variant<bool>(assert));
 
     try
     {
@@ -268,7 +268,7 @@
             continue;
         }
 
-        sdbusplus::message::variant<AssociationList> assoc;
+        std::variant<AssociationList> assoc;
         try
         {
             reply.read(assoc);

manager.hpp

diff --git a/manager.hpp b/manager.hpp
index 34cfa55..85319fe 100644
--- a/manager.hpp
+++ b/manager.hpp
@@ -158,7 +158,7 @@
                           const std::string& objPath,
                           const std::string& property, const T& value)
     {
-        sdbusplus::message::variant<T> data = value;
+        std::variant<T> data = value;
 
         auto method = bus.new_method_call(service.c_str(), objPath.c_str(),
                                           DBUS_PROPERTY_IFACE, "Set");