Move variant usage to std
Since sdbusplus now uses std, it's cleaner just to
use the variant type directly not behind the namespace.
This was primarily done with sed commands
Tested-by: It builds
Change-Id: I87a90a2942cfc6da312cb0e045cce7cd40a644e5
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/include/Utils.hpp b/include/Utils.hpp
index 7c58e2a..a1c9d37 100644
--- a/include/Utils.hpp
+++ b/include/Utils.hpp
@@ -14,9 +14,8 @@
const std::regex illegalDbusRegex("[^A-Za-z0-9_]");
using BasicVariantType =
- sdbusplus::message::variant<std::vector<std::string>, std::string, int64_t,
- uint64_t, double, int32_t, uint32_t, int16_t,
- uint16_t, uint8_t, bool>;
+ std::variant<std::vector<std::string>, std::string, int64_t, uint64_t,
+ double, int32_t, uint32_t, int16_t, uint16_t, uint8_t, bool>;
using ManagedObjectType = boost::container::flat_map<
sdbusplus::message::object_path,
@@ -66,18 +65,15 @@
}
if constexpr (std::is_same_v<T, double>)
{
- return sdbusplus::message::variant_ns::visit(VariantToDoubleVisitor(),
- it->second);
+ return std::visit(VariantToDoubleVisitor(), it->second);
}
else if constexpr (std::is_unsigned_v<T>)
{
- return sdbusplus::message::variant_ns::visit(
- VariantToUnsignedIntVisitor(), it->second);
+ return std::visit(VariantToUnsignedIntVisitor(), it->second);
}
else if constexpr (std::is_same_v<T, std::string>)
{
- return sdbusplus::message::variant_ns::visit(VariantToStringVisitor(),
- it->second);
+ return std::visit(VariantToStringVisitor(), it->second);
}
else
{