commit 3eb82629395c1967c169f9ea8472112271f5ff29
author James Feist <james.feist@linux.intel.com> Fri Feb 08 13:10:22 2019 -0800
committer James Feist <james.feist@linux.intel.com> Fri Feb 08 13:25:53 2019 -0800
tree 17161239f385348756fe825dd319385546b8f476
parent fc94b215535c0a1394528bf33ab2661b3da86926

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>

src/Thresholds.cpp

diff --git a/src/Thresholds.cpp b/src/Thresholds.cpp
index 10b1674..1494396 100644
--- a/src/Thresholds.cpp
+++ b/src/Thresholds.cpp
@@ -10,7 +10,6 @@
 static constexpr bool DEBUG = false;
 static constexpr size_t maxThresholds = 4;
 
-namespace variant_ns = sdbusplus::message::variant_ns;
 namespace thresholds
 {
 unsigned int toBusValue(const Level &level)
@@ -67,8 +66,8 @@
             auto labelFind = item.second.find("Label");
             if (labelFind == item.second.end())
                 continue;
-            if (variant_ns::visit(VariantToStringVisitor(),
-                                  labelFind->second) != *matchLabel)
+            if (std::visit(VariantToStringVisitor(), labelFind->second) !=
+                *matchLabel)
                 continue;
         }
         auto directionFind = item.second.find("Direction");
@@ -83,8 +82,8 @@
         }
         Level level;
         Direction direction;
-        if (variant_ns::visit(VariantToUnsignedIntVisitor(),
-                              severityFind->second) == 0)
+        if (std::visit(VariantToUnsignedIntVisitor(), severityFind->second) ==
+            0)
         {
             level = Level::WARNING;
         }
@@ -92,8 +91,8 @@
         {
             level = Level::CRITICAL;
         }
-        if (variant_ns::visit(VariantToStringVisitor(),
-                              directionFind->second) == "less than")
+        if (std::visit(VariantToStringVisitor(), directionFind->second) ==
+            "less than")
         {
             direction = Direction::LOW;
         }
@@ -101,8 +100,7 @@
         {
             direction = Direction::HIGH;
         }
-        float val =
-            variant_ns::visit(VariantToFloatVisitor(), valueFind->second);
+        float val = std::visit(VariantToFloatVisitor(), valueFind->second);
 
         thresholdVector.emplace_back(level, direction, val);
     }
@@ -136,18 +134,18 @@
                     std::cerr << "Malformed threshold in configuration\n";
                     return;
                 }
-                unsigned int level = variant_ns::visit(
-                    VariantToUnsignedIntVisitor(), severityFind->second);
+                unsigned int level = std::visit(VariantToUnsignedIntVisitor(),
+                                                severityFind->second);
 
-                std::string dir = variant_ns::visit(VariantToStringVisitor(),
-                                                    directionFind->second);
+                std::string dir =
+                    std::visit(VariantToStringVisitor(), directionFind->second);
                 if ((toBusValue(threshold.level) != level) ||
                     (toBusValue(threshold.direction) != dir))
                 {
                     return; // not the droid we're looking for
                 }
 
-                sdbusplus::message::variant<double> value(threshold.value);
+                std::variant<double> value(threshold.value);
                 conn->async_method_call(
                     [](const boost::system::error_code &ec) {
                         if (ec)