commit d7a55bfdbd44c732e4308cf2d35552167a908419
author James Feist <james.feist@linux.intel.com> Thu Oct 11 14:40:07 2018 -0700
committer James Feist <james.feist@linux.intel.com> Thu Oct 11 21:43:41 2018 +0000
tree 785c7edd5ea17938cbc40beb61e542281a504ba4
parent 67efa244374f22c9c3db1adacf97919a11335874

Stop using mapbox namespace directly

sdbusplus is transitioning to std::variant, the
sdbusplus::message::variant_ns will be changed to std
and should move over correctly, but mapbox will be deleted.

Tested-by: It built

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

dbus/dbusconfiguration.cpp

diff --git a/dbus/dbusconfiguration.cpp b/dbus/dbusconfiguration.cpp
index 5f8558d..45f51b6 100644
--- a/dbus/dbusconfiguration.cpp
+++ b/dbus/dbusconfiguration.cpp
@@ -298,9 +298,9 @@
             }
 
             auto& details = ZoneDetailsConfig[index];
-            details.minthermalrpm = mapbox::util::apply_visitor(
+            details.minthermalrpm = variant_ns::apply_visitor(
                 VariantToFloatVisitor(), zone.at("MinThermalRpm"));
-            details.failsafepercent = mapbox::util::apply_visitor(
+            details.failsafepercent = variant_ns::apply_visitor(
                 VariantToFloatVisitor(), zone.at("FailSafePercent"));
         }
         auto findBase = configuration.second.find(pidConfigurationInterface);
@@ -406,29 +406,29 @@
                 }
                 else
                 {
-                    info.setpoint = mapbox::util::apply_visitor(
+                    info.setpoint = variant_ns::apply_visitor(
                         VariantToFloatVisitor(), base.at("SetPoint"));
                 }
                 info.pidInfo.ts = 1.0; // currently unused
-                info.pidInfo.p_c = mapbox::util::apply_visitor(
+                info.pidInfo.p_c = variant_ns::apply_visitor(
                     VariantToFloatVisitor(), base.at("PCoefficient"));
-                info.pidInfo.i_c = mapbox::util::apply_visitor(
+                info.pidInfo.i_c = variant_ns::apply_visitor(
                     VariantToFloatVisitor(), base.at("ICoefficient"));
-                info.pidInfo.ff_off = mapbox::util::apply_visitor(
+                info.pidInfo.ff_off = variant_ns::apply_visitor(
                     VariantToFloatVisitor(), base.at("FFOffCoefficient"));
-                info.pidInfo.ff_gain = mapbox::util::apply_visitor(
+                info.pidInfo.ff_gain = variant_ns::apply_visitor(
                     VariantToFloatVisitor(), base.at("FFGainCoefficient"));
-                info.pidInfo.i_lim.max = mapbox::util::apply_visitor(
+                info.pidInfo.i_lim.max = variant_ns::apply_visitor(
                     VariantToFloatVisitor(), base.at("ILimitMax"));
-                info.pidInfo.i_lim.min = mapbox::util::apply_visitor(
+                info.pidInfo.i_lim.min = variant_ns::apply_visitor(
                     VariantToFloatVisitor(), base.at("ILimitMin"));
-                info.pidInfo.out_lim.max = mapbox::util::apply_visitor(
+                info.pidInfo.out_lim.max = variant_ns::apply_visitor(
                     VariantToFloatVisitor(), base.at("OutLimitMax"));
-                info.pidInfo.out_lim.min = mapbox::util::apply_visitor(
+                info.pidInfo.out_lim.min = variant_ns::apply_visitor(
                     VariantToFloatVisitor(), base.at("OutLimitMin"));
-                info.pidInfo.slew_neg = mapbox::util::apply_visitor(
+                info.pidInfo.slew_neg = variant_ns::apply_visitor(
                     VariantToFloatVisitor(), base.at("SlewNeg"));
-                info.pidInfo.slew_pos = mapbox::util::apply_visitor(
+                info.pidInfo.slew_pos = variant_ns::apply_visitor(
                     VariantToFloatVisitor(), base.at("SlewPos"));
             }
         }
@@ -499,14 +499,14 @@
                 if (findPosHyst != base.end())
                 {
                     info.stepwiseInfo.positiveHysteresis =
-                        mapbox::util::apply_visitor(VariantToFloatVisitor(),
-                                                    findPosHyst->second);
+                        variant_ns::apply_visitor(VariantToFloatVisitor(),
+                                                  findPosHyst->second);
                 }
                 if (findNegHyst != base.end())
                 {
                     info.stepwiseInfo.positiveHysteresis =
-                        mapbox::util::apply_visitor(VariantToFloatVisitor(),
-                                                    findNegHyst->second);
+                        variant_ns::apply_visitor(VariantToFloatVisitor(),
+                                                  findNegHyst->second);
                 }
                 std::vector<double> readings =
                     variant_ns::get<std::vector<double>>(base.at("Reading"));

dbus/dbuspassive.cpp

diff --git a/dbus/dbuspassive.cpp b/dbus/dbuspassive.cpp
index e269b3d..702bf8d 100644
--- a/dbus/dbuspassive.cpp
+++ b/dbus/dbuspassive.cpp
@@ -99,8 +99,8 @@
         auto valPropMap = msgData.find("Value");
         if (valPropMap != msgData.end())
         {
-            double value = mapbox::util::apply_visitor(VariantToDoubleVisitor(),
-                                                       valPropMap->second);
+            double value = sdbusplus::message::variant_ns::apply_visitor(
+                VariantToDoubleVisitor(), valPropMap->second);
 
             value *= std::pow(10, owner->getScale());
 

dbus/util.cpp

diff --git a/dbus/util.cpp b/dbus/util.cpp
index f79bf4f..0d107ab 100644
--- a/dbus/util.cpp
+++ b/dbus/util.cpp
@@ -83,8 +83,8 @@
         prop->scale = 0;
     }
 
-    prop->value =
-        mapbox::util::apply_visitor(VariantToDoubleVisitor(), propMap["Value"]);
+    prop->value = sdbusplus::message::variant_ns::apply_visitor(
+        VariantToDoubleVisitor(), propMap["Value"]);
 
     return;
 }