sdbusplus: remove deprecated variant_ns
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I8ae0323c7eabb6c0cde2126b07a7396b4e3e17ea
diff --git a/test/test.cpp b/test/test.cpp
index cf61b84..2222580 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -425,8 +425,8 @@
sig.read(sigInterface);
assert(sigInterface == "xyz.openbmc_project.Example.Iface1");
sig.read(sigProperties);
- assert(sdbusplus::message::variant_ns::get<std::string>(
- sigProperties["ExampleProperty1"]) == "changed");
+ assert(std::get<std::string>(sigProperties["ExampleProperty1"]) ==
+ "changed");
}
}
}
diff --git a/test/utils_test.cpp b/test/utils_test.cpp
index c1f15f7..55e2363 100644
--- a/test/utils_test.cpp
+++ b/test/utils_test.cpp
@@ -2,18 +2,18 @@
#include <gtest/gtest.h>
-using namespace sdbusplus::message::variant_ns;
using namespace phosphor::inventory::manager;
using namespace std::string_literals;
TEST(UtilsTest, TestVariantVisitor)
{
- variant<int, std::string> ib1(100);
- auto converted1 = convertVariant<variant<int>>(ib1);
- EXPECT_TRUE(get<int>(converted1) == 100);
+ std::variant<int, std::string> ib1(100);
+ auto converted1 = convertVariant<std::variant<int>>(ib1);
+ EXPECT_TRUE(std::get<int>(converted1) == 100);
- variant<int, std::string> ib2(100);
- EXPECT_THROW(convertVariant<variant<std::string>>(ib2), std::runtime_error);
+ std::variant<int, std::string> ib2(100);
+ EXPECT_THROW(convertVariant<std::variant<std::string>>(ib2),
+ std::runtime_error);
}
TEST(UtilsTest, TestCompareFirst)