commit 625429bad76734d728fbcee58a607279addb8d3d
author Yoo, Jae Hyun <jae.hyun.yoo@intel.com> Wed Oct 17 18:19:02 2018 -0700
committer Ed Tanous <ed.tanous@intel.com> Fri Nov 16 18:56:36 2018 +0000
tree 35e3de01fec19f7640cef2ce6a6a2b446cd15ae0
parent 01348da410fe3564ecd7d4db47806bfc0e2f2beb

Stop using mapbox directly

This is going to be removed from sdbusplus

Change-Id: I912f560fac7d41e13d3754df9363b95cedac78f8
Signed-off-by: Yoo, Jae Hyun <jae.hyun.yoo@intel.com>

sensors/src/FanMain.cpp

diff --git a/sensors/src/FanMain.cpp b/sensors/src/FanMain.cpp
index 6818692..b562e05 100644
--- a/sensors/src/FanMain.cpp
+++ b/sensors/src/FanMain.cpp
@@ -31,6 +31,7 @@
 static constexpr bool DEBUG = false;
 
 namespace fs = std::experimental::filesystem;
+namespace variant_ns = sdbusplus::message::variant_ns;
 static constexpr std::array<const char*, 1> SENSOR_TYPES = {
     "xyz.openbmc_project.Configuration.AspeedFan"};
 static std::regex INPUT_REGEX(R"(fan(\d+)_input)");
@@ -117,8 +118,8 @@
             {
                 continue;
             }
-            uint16_t pwmIndex = mapbox::util::apply_visitor(
-                VariantToUnsignedIntVisitor(), findPwmIndex->second);
+            uint16_t pwmIndex = variant_ns::visit(VariantToUnsignedIntVisitor(),
+                                                  findPwmIndex->second);
             auto oemNamePath = directory.string() + R"(/of_node/oemname)" +
                                std::to_string(pwmIndex);
 
@@ -144,7 +145,7 @@
                 std::cerr << baseConfiguration->first << " missing index\n";
                 continue;
             }
-            unsigned int configIndex = mapbox::util::apply_visitor(
+            unsigned int configIndex = variant_ns::visit(
                 VariantToUnsignedIntVisitor(), findIndex->second);
 
             if (configIndex != index)
@@ -157,7 +158,7 @@
             {
                 continue;
             }
-            std::string connectorName = mapbox::util::apply_visitor(
+            std::string connectorName = variant_ns::visit(
                 VariantToStringVisitor(), findConnectorName->second);
             boost::replace_all(connectorName, " ", "_");
             if (connectorName == oemName)