sdbusplus: replace message::variant with std::variant
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I3ca37b91268fdbd8579d92d293997a3d49258a87
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>>>>>;
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,
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