commit abe4941845b64832b3e6945f9fc251ff68fd5edf
author Patrick Williams <patrick@stwcx.xyz> Wed May 13 17:59:47 2020 -0500
committer Matt Spinler <spinler@us.ibm.com> Mon May 18 14:28:57 2020 +0000
tree 8b68b72686dadd51a2f2c6cab5c23c290f3ef757
parent 365d61c68825435d2afeb0c2e1ec007ccec5b603

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

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

phosphor-power-supply/power_supply.cpp

diff --git a/phosphor-power-supply/power_supply.cpp b/phosphor-power-supply/power_supply.cpp
index 7e617a9..6df3e3e 100644
--- a/phosphor-power-supply/power_supply.cpp
+++ b/phosphor-power-supply/power_supply.cpp
@@ -96,7 +96,7 @@
 void PowerSupply::inventoryChanged(sdbusplus::message::message& msg)
 {
     std::string msgSensor;
-    std::map<std::string, sdbusplus::message::variant<uint32_t, bool>> msgData;
+    std::map<std::string, std::variant<uint32_t, bool>> msgData;
     msg.read(msgSensor, msgData);
 
     // Check if it was the Present property that changed.

phosphor-power-supply/psu_manager.cpp

diff --git a/phosphor-power-supply/psu_manager.cpp b/phosphor-power-supply/psu_manager.cpp
index 9880b08..f31ba73 100644
--- a/phosphor-power-supply/psu_manager.cpp
+++ b/phosphor-power-supply/psu_manager.cpp
@@ -114,7 +114,7 @@
 {
     int32_t state = 0;
     std::string msgSensor;
-    std::map<std::string, sdbusplus::message::variant<int32_t>> msgData;
+    std::map<std::string, std::variant<int32_t>> msgData;
     msg.read(msgSensor, msgData);
 
     // Check if it was the Present property that changed.

power-supply/power_supply.cpp

diff --git a/power-supply/power_supply.cpp b/power-supply/power_supply.cpp
index c780c47..7247c4c 100644
--- a/power-supply/power_supply.cpp
+++ b/power-supply/power_supply.cpp
@@ -178,7 +178,7 @@
 void PowerSupply::inventoryChanged(sdbusplus::message::message& msg)
 {
     std::string msgSensor;
-    std::map<std::string, sdbusplus::message::variant<uint32_t, bool>> msgData;
+    std::map<std::string, std::variant<uint32_t, bool>> msgData;
     msg.read(msgSensor, msgData);
 
     // Check if it was the Present property that changed.
@@ -215,7 +215,7 @@
 {
     int32_t state = 0;
     std::string msgSensor;
-    std::map<std::string, sdbusplus::message::variant<int32_t>> msgData;
+    std::map<std::string, std::variant<int32_t>> msgData;
     msg.read(msgSensor, msgData);
 
     // Check if it was the Present property that changed.

utility.hpp

diff --git a/utility.hpp b/utility.hpp
index 0f7b312..df59b92 100644
--- a/utility.hpp
+++ b/utility.hpp
@@ -51,7 +51,7 @@
                  const std::string& path, const std::string& service,
                  sdbusplus::bus::bus& bus, T& value)
 {
-    sdbusplus::message::variant<T> property;
+    std::variant<T> property;
 
     auto method = bus.new_method_call(service.c_str(), path.c_str(),
                                       PROPERTY_INTF, "Get");
@@ -79,7 +79,7 @@
                  const std::string& path, const std::string& service,
                  sdbusplus::bus::bus& bus, T& value)
 {
-    sdbusplus::message::variant<T> propertyValue(value);
+    std::variant<T> propertyValue(value);
 
     auto method = bus.new_method_call(service.c_str(), path.c_str(),
                                       PROPERTY_INTF, "Set");