commit b05bc12c7d07f1cd9c8b73c2d3617a96676183b2
author Patrick Williams <patrick@stwcx.xyz> Wed May 13 12:21:00 2020 -0500
committer Patrick Williams <patrick@stwcx.xyz> Wed May 13 12:22:06 2020 -0500
tree d74a3f38bfa80aea019238c2220df93a156195da
parent 5592202fa6f28040518391c2ef2b7d55ce2da16b

sdbusplus: remove deprecated variant_ns

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

fail-monitor/monitor.cpp

diff --git a/fail-monitor/monitor.cpp b/fail-monitor/monitor.cpp
index 51eb1f3..2ca61ad 100644
--- a/fail-monitor/monitor.cpp
+++ b/fail-monitor/monitor.cpp
@@ -64,7 +64,7 @@
 
     reply.read(property);
 
-    auto value = sdbusplus::message::variant_ns::get<std::string>(property);
+    auto value = std::get<std::string>(property);
     return (value == FAILED_STATE);
 }
 

src/main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 0ba614d..5f75432 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -141,8 +141,7 @@
                 std::cerr << "Error getting associations from " << path << "\n";
             }
             std::vector<Association> associations =
-                sdbusplus::message::variant_ns::get<std::vector<Association>>(
-                    variantAssociations);
+                std::get<std::vector<Association>>(variantAssociations);
             associationChanged(objectServer, associations, path, processName,
                                interfaceMap, associationMaps);
         },
@@ -613,8 +612,7 @@
             if (prop != values.end())
             {
                 std::vector<Association> associations =
-                    sdbusplus::message::variant_ns::get<
-                        std::vector<Association>>(prop->second);
+                    std::get<std::vector<Association>>(prop->second);
 
                 std::string well_known;
                 if (!getWellKnown(name_owners, message.get_sender(),

src/processing.cpp

diff --git a/src/processing.cpp b/src/processing.cpp
index f3f59a9..b0c73b3 100644
--- a/src/processing.cpp
+++ b/src/processing.cpp
@@ -127,8 +127,7 @@
                 continue;
             }
             std::vector<Association> associations =
-                sdbusplus::message::variant_ns::get<std::vector<Association>>(
-                    *variantAssociations);
+                std::get<std::vector<Association>>(*variantAssociations);
             associationChanged(server, associations, objPath.str, wellKnown,
                                interfaceMap, assocMaps);
         }