commit 1f802f5e9086f3771a8b1d50c5af4a77be56cee0
author James Feist <james.feist@linux.intel.com> Fri Feb 08 13:51:43 2019 -0800
committer James Feist <james.feist@linux.intel.com> Fri Feb 08 13:51:43 2019 -0800
tree 08e05a8eb9c9f9e467d21df800bcfe9866c6b81b
parent a510ea2b5a2bba96cc5b2bdc4541b2f68b8cf299

Move all variant usage to std

This just a style change, remove variant_ns
in favor of std.

Tested-by: it built

Change-Id: Id5a075e8b73a7724cbc5153fb7dfcf369e79c483
Signed-off-by: James Feist <james.feist@linux.intel.com>

dbus/dbuspassive.cpp

diff --git a/dbus/dbuspassive.cpp b/dbus/dbuspassive.cpp
index 32c31af..6d8aa03 100644
--- a/dbus/dbuspassive.cpp
+++ b/dbus/dbuspassive.cpp
@@ -23,6 +23,7 @@
 #include <mutex>
 #include <sdbusplus/bus.hpp>
 #include <string>
+#include <variant>
 
 std::unique_ptr<ReadInterface> DbusPassive::createDbusPassive(
     sdbusplus::bus::bus& bus, const std::string& type, const std::string& id,
@@ -114,8 +115,7 @@
 int handleSensorValue(sdbusplus::message::message& msg, DbusPassive* owner)
 {
     std::string msgSensor;
-    std::map<std::string, sdbusplus::message::variant<int64_t, double, bool>>
-        msgData;
+    std::map<std::string, std::variant<int64_t, double, bool>> msgData;
 
     msg.read(msgSensor, msgData);
 
@@ -124,8 +124,8 @@
         auto valPropMap = msgData.find("Value");
         if (valPropMap != msgData.end())
         {
-            double value = sdbusplus::message::variant_ns::visit(
-                VariantToDoubleVisitor(), valPropMap->second);
+            double value =
+                std::visit(VariantToDoubleVisitor(), valPropMap->second);
 
             value *= std::pow(10, owner->getScale());
 
@@ -145,16 +145,14 @@
         bool asserted = false;
         if (criticalAlarmLow != msgData.end())
         {
-            asserted = sdbusplus::message::variant_ns::get<bool>(
-                criticalAlarmLow->second);
+            asserted = std::get<bool>(criticalAlarmLow->second);
         }
 
         // checking both as in theory you could de-assert one threshold and
         // assert the other at the same moment
         if (!asserted && criticalAlarmHigh != msgData.end())
         {
-            asserted = sdbusplus::message::variant_ns::get<bool>(
-                criticalAlarmHigh->second);
+            asserted = std::get<bool>(criticalAlarmHigh->second);
         }
         owner->setFailed(asserted);
     }