commit 886a48a98aa05f272b1bdd222baebacb38d9957b
author Patrick Williams <patrick@stwcx.xyz> Wed May 13 17:44:37 2020 -0500
committer Patrick Williams <patrick@stwcx.xyz> Wed May 13 17:47:14 2020 -0500
tree 114bcc12a598168bfe58904aa246bd5b813d3d72
parent 6d83e4eedb3c26d6cd9a9ec3451394de7a647a65

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

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

include/commandutils.hpp

diff --git a/include/commandutils.hpp b/include/commandutils.hpp
index e2f6523..3bd23f8 100644
--- a/include/commandutils.hpp
+++ b/include/commandutils.hpp
@@ -59,9 +59,8 @@
 using Association = std::tuple<std::string, std::string, std::string>;
 
 using DbusVariant =
-    sdbusplus::message::variant<std::string, bool, uint8_t, uint16_t, int16_t,
-                                uint32_t, int32_t, uint64_t, int64_t, double,
-                                std::vector<Association>>;
+    std::variant<std::string, bool, uint8_t, uint16_t, int16_t, uint32_t,
+                 int32_t, uint64_t, int64_t, double, std::vector<Association>>;
 using GetSubTreeType = std::vector<
     std::pair<std::string,
               std::vector<std::pair<std::string, std::vector<std::string>>>>>;

include/smbiosmdrv2handler.hpp

diff --git a/include/smbiosmdrv2handler.hpp b/include/smbiosmdrv2handler.hpp
index d677376..3d9b627 100644
--- a/include/smbiosmdrv2handler.hpp
+++ b/include/smbiosmdrv2handler.hpp
@@ -273,7 +273,7 @@
     bool smbiosTryLock(uint8_t flag, uint8_t index, uint16_t *session,
                        uint16_t timeout);
     int sdplusMdrv2GetProperty(const std::string &name,
-                               sdbusplus::message::variant<uint8_t> &value,
+                               std::variant<uint8_t> &value,
                                const std::string &service);
 
     Mdr2DirStruct smbiosDir{smbiosAgentVersion,

include/variantvisitors.hpp

diff --git a/include/variantvisitors.hpp b/include/variantvisitors.hpp
index f8dbb0c..a440bfc 100644
--- a/include/variantvisitors.hpp
+++ b/include/variantvisitors.hpp
@@ -21,7 +21,6 @@
 namespace ipmi
 {
 
-using DbusVariant =
-    sdbusplus::message::variant<std::string, bool, uint8_t, uint16_t, int16_t,
-                                uint32_t, int32_t, uint64_t, int64_t, double>;
+using DbusVariant = std::variant<std::string, bool, uint8_t, uint16_t, int16_t,
+                                 uint32_t, int32_t, uint64_t, int64_t, double>;
 } // namespace ipmi