Use std::variant
When first committed, I had a misunderstanding of what dedup variant
does. In this case, because we unpack all variants of 64/32 bit and int
vs uint, so in this case, dedup variant doesn't do anything, and just
adds template complexity. In terms of developer readability,
std::variant is a c++ concept that is infinitely googlable, and not
having to look it up through sdbusplus should be better.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: Ia73b642fd06b24187503196bcdfecb9c896d62c9
diff --git a/include/dbus_utility.hpp b/include/dbus_utility.hpp
index eefc115..481b33d 100644
--- a/include/dbus_utility.hpp
+++ b/include/dbus_utility.hpp
@@ -16,10 +16,10 @@
#pragma once
#include <sdbusplus/message.hpp>
-#include <sdbusplus/utility/dedup_variant.hpp>
#include <filesystem>
#include <regex>
+#include <variant>
namespace dbus
{
@@ -28,7 +28,7 @@
{
// clang-format off
-using DbusVariantType = sdbusplus::utility::dedup_variant_t<
+using DbusVariantType = std::variant<
std::vector<std::tuple<std::string, std::string, std::string>>,
std::vector<std::string>,
std::vector<double>,
@@ -42,7 +42,6 @@
uint16_t,
uint8_t,
bool,
- size_t,
sdbusplus::message::unix_fd,
std::vector<uint32_t>,
std::vector<uint16_t>,