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/FanMain.cpp

diff --git a/src/FanMain.cpp b/src/FanMain.cpp
index fd5e7af..48ed692 100644
--- a/src/FanMain.cpp
+++ b/src/FanMain.cpp
@@ -32,7 +32,7 @@
 static constexpr bool DEBUG = false;
 
 namespace fs = std::filesystem;
-namespace variant_ns = sdbusplus::message::variant_ns;
+
 static constexpr std::array<const char*, 2> sensorTypes = {
     "xyz.openbmc_project.Configuration.AspeedFan",
     "xyz.openbmc_project.Configuration.I2CFan"};
@@ -151,8 +151,8 @@
                 std::cerr << baseConfiguration->first << " missing index\n";
                 continue;
             }
-            unsigned int configIndex = variant_ns::visit(
-                VariantToUnsignedIntVisitor(), findIndex->second);
+            unsigned int configIndex =
+                std::visit(VariantToUnsignedIntVisitor(), findIndex->second);
             if (configIndex != index)
             {
                 continue;
@@ -175,9 +175,9 @@
                               << " missing bus or address\n";
                     continue;
                 }
-                unsigned int configBus = variant_ns::visit(
-                    VariantToUnsignedIntVisitor(), findBus->second);
-                unsigned int configAddress = variant_ns::visit(
+                unsigned int configBus =
+                    std::visit(VariantToUnsignedIntVisitor(), findBus->second);
+                unsigned int configAddress = std::visit(
                     VariantToUnsignedIntVisitor(), findAddress->second);
 
                 if (configBus == bus && configAddress == configAddress)
@@ -200,9 +200,7 @@
                       << path.string() << "\n";
             continue;
         }
-        std::string sensorName =
-            sdbusplus::message::variant_ns::get<std::string>(
-                findSensorName->second);
+        std::string sensorName = std::get<std::string>(findSensorName->second);
         // on rescans, only update sensors we were signaled by
         auto findSensor = tachSensors.find(sensorName);
         if (!firstScan && findSensor != tachSensors.end())
@@ -249,9 +247,9 @@
             }
             else
             {
-                size_t index = variant_ns::get<uint64_t>(findIndex->second);
+                size_t index = std::get<uint64_t>(findIndex->second);
                 bool inverted =
-                    variant_ns::get<std::string>(findPolarity->second) == "Low";
+                    std::get<std::string>(findPolarity->second) == "Low";
                 presenceSensor =
                     std::make_unique<PresenceSensor>(index, inverted, io);
             }
@@ -329,8 +327,8 @@
                                 sensor.second->name);
                         }
                         systemRedundancy = std::make_unique<RedundancySensor>(
-                            variant_ns::get<uint64_t>(findCount->second),
-                            sensorList, objectServer);
+                            std::get<uint64_t>(findCount->second), sensorList,
+                            objectServer);
 
                         return;
                     }