commit 35b4f337bc4425e8a0c4cdcc17a741bc93b343f0
author Patrick Williams <patrick@stwcx.xyz> Wed May 13 17:53:09 2020 -0500
committer Patrick Williams <patrick@stwcx.xyz> Wed May 13 17:53:09 2020 -0500
tree 6f27fa89b7ccd19287a5369927fa9e1e25a1ea37
parent 34ef1e526b8eedf5ce9a0396b2a2627218a39378

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

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

mslverify/util.hpp

diff --git a/mslverify/util.hpp b/mslverify/util.hpp
index 7e6e138..ae83006 100644
--- a/mslverify/util.hpp
+++ b/mslverify/util.hpp
@@ -16,7 +16,7 @@
 
 /** @brief Alias for PropertiesChanged signal callbacks. */
 template <typename... T>
-using Properties = std::map<std::string, sdbusplus::message::variant<T...>>;
+using Properties = std::map<std::string, std::variant<T...>>;
 
 namespace sdbusplus
 {
@@ -123,7 +123,7 @@
     auto msg =
         callMethod(bus, busName, path, "org.freedesktop.DBus.Properties"s,
                    "Get"s, interface, property);
-    ::sdbusplus::message::variant<Property> value;
+    ::std::variant<Property> value;
     msg.read(value);
     return std::get<Property>(value);
 }

src/data_types.hpp

diff --git a/src/data_types.hpp b/src/data_types.hpp
index c96f1a0..a022fea 100644
--- a/src/data_types.hpp
+++ b/src/data_types.hpp
@@ -61,11 +61,9 @@
 /** @brief ObjectManager.InterfacesAdded signal signature alias. */
 template <typename T>
 using InterfacesAdded =
-    std::map<std::string,
-             std::map<std::string, sdbusplus::message::variant<T>>>;
-using Value =
-    sdbusplus::message::variant<bool, uint8_t, int16_t, uint16_t, int32_t,
-                                uint32_t, int64_t, uint64_t, std::string>;
+    std::map<std::string, std::map<std::string, std::variant<T>>>;
+using Value = std::variant<bool, uint8_t, int16_t, uint16_t, int32_t, uint32_t,
+                           int64_t, uint64_t, std::string>;
 
 /** @brief ObjectManager.InterfacesAdded signal signature alias. */
 using Interface = std::string;
@@ -77,7 +75,7 @@
 
 /** @brief Properties.GetAll response signature alias. */
 template <typename T>
-using PropertiesChanged = std::map<std::string, sdbusplus::message::variant<T>>;
+using PropertiesChanged = std::map<std::string, std::variant<T>>;
 
 /** @brief Lookup index for properties . */
 // *INDENT-OFF*

src/resolve_errors.cpp

diff --git a/src/resolve_errors.cpp b/src/resolve_errors.cpp
index 7273c14..923529f 100644
--- a/src/resolve_errors.cpp
+++ b/src/resolve_errors.cpp
@@ -34,7 +34,7 @@
 
 using namespace phosphor::logging;
 using EndpointList = std::vector<std::string>;
-using EndpointsProperty = sdbusplus::message::variant<EndpointList>;
+using EndpointsProperty = std::variant<EndpointList>;
 
 void ResolveCallout::operator()(Context ctx)
 {
@@ -90,7 +90,7 @@
             }
         }
 
-        sdbusplus::message::variant<bool> resolved = true;
+        std::variant<bool> resolved = true;
 
         auto response =
             SDBusPlus::callMethod(busName, logEntry, PROPERTY_IFACE, "Set",