commit 14fde84ecb6b8402d6a450ee3ae21a76da9ae0af
author James Feist <james.feist@linux.intel.com> Thu Dec 06 10:19:40 2018 -0800
committer Vernon Mauery <vernon.mauery@linux.intel.com> Thu Dec 06 21:33:34 2018 +0000
tree d56fc5ef731e2d4a7d1ab4c4af779b431a887a21
parent 360f593bf03ddc7e130c49a949a21b307d0c5262

Update variant usage to use visit

This is required for std::variant

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

src/sensorcommands.cpp

diff --git a/src/sensorcommands.cpp b/src/sensorcommands.cpp
index aea03ab..6456ca1 100644
--- a/src/sensorcommands.cpp
+++ b/src/sensorcommands.cpp
@@ -38,6 +38,7 @@
              std::map<std::string, std::map<std::string, DbusVariant>>>;
 
 using SensorMap = std::map<std::string, std::map<std::string, DbusVariant>>;
+namespace variant_ns = sdbusplus::message::variant_ns;
 
 static constexpr int sensorListUpdatePeriod = 10;
 static constexpr int sensorMapUpdatePeriod = 2;
@@ -104,11 +105,11 @@
 
     if (maxMap != sensorPropertyMap.end())
     {
-        max = apply_visitor(VariantToDoubleVisitor(), maxMap->second);
+        max = variant_ns::visit(VariantToDoubleVisitor(), maxMap->second);
     }
     if (minMap != sensorPropertyMap.end())
     {
-        min = apply_visitor(VariantToDoubleVisitor(), minMap->second);
+        min = variant_ns::visit(VariantToDoubleVisitor(), minMap->second);
     }
 }
 
@@ -218,7 +219,7 @@
         return IPMI_CC_RESPONSE_ERROR;
     }
     auto &value = sensorObject->second["Value"];
-    double reading = apply_visitor(VariantToDoubleVisitor(), value);
+    double reading = variant_ns::visit(VariantToDoubleVisitor(), value);
 
     double max;
     double min;
@@ -494,8 +495,8 @@
                 msgReply->readable |=
                     1 << static_cast<int>(
                         IPMIhresholdRespBits::upperNonCritical);
-                double value = apply_visitor(VariantToDoubleVisitor(),
-                                             warningHigh->second);
+                double value = variant_ns::visit(VariantToDoubleVisitor(),
+                                                 warningHigh->second);
                 msgReply->uppernc = scaleIPMIValueFromDouble(
                     value, mValue, rExp, bValue, bExp, bSigned);
             }
@@ -504,8 +505,8 @@
                 msgReply->readable |=
                     1 << static_cast<int>(
                         IPMIhresholdRespBits::lowerNonCritical);
-                double value =
-                    apply_visitor(VariantToDoubleVisitor(), warningLow->second);
+                double value = variant_ns::visit(VariantToDoubleVisitor(),
+                                                 warningLow->second);
                 msgReply->lowernc = scaleIPMIValueFromDouble(
                     value, mValue, rExp, bValue, bExp, bSigned);
             }
@@ -521,8 +522,8 @@
             {
                 msgReply->readable |=
                     1 << static_cast<int>(IPMIhresholdRespBits::upperCritical);
-                double value = apply_visitor(VariantToDoubleVisitor(),
-                                             criticalHigh->second);
+                double value = variant_ns::visit(VariantToDoubleVisitor(),
+                                                 criticalHigh->second);
                 msgReply->uppercritical = scaleIPMIValueFromDouble(
                     value, mValue, rExp, bValue, bExp, bSigned);
             }
@@ -530,8 +531,8 @@
             {
                 msgReply->readable |=
                     1 << static_cast<int>(IPMIhresholdRespBits::lowerCritical);
-                double value = apply_visitor(VariantToDoubleVisitor(),
-                                             criticalLow->second);
+                double value = variant_ns::visit(VariantToDoubleVisitor(),
+                                                 criticalLow->second);
                 msgReply->lowercritical = scaleIPMIValueFromDouble(
                     value, mValue, rExp, bValue, bExp, bSigned);
             }
@@ -1019,12 +1020,12 @@
     double min = -127;
     if (maxObject != sensorObject->second.end())
     {
-        max = apply_visitor(VariantToDoubleVisitor(), maxObject->second);
+        max = variant_ns::visit(VariantToDoubleVisitor(), maxObject->second);
     }
 
     if (minObject != sensorObject->second.end())
     {
-        min = apply_visitor(VariantToDoubleVisitor(), minObject->second);
+        min = variant_ns::visit(VariantToDoubleVisitor(), minObject->second);
     }
 
     int16_t mValue;