dbusconfiguration: Change apply_visitor to visit
New sdbusplus changes remove apply_visitor.
Tested-by: Manually checked out latest sdbusplus and
made sure it built.
Change-Id: I4418cf29339c61df7a172c1b44a6347b5f20a6ea
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/dbus/dbusconfiguration.cpp b/dbus/dbusconfiguration.cpp
index 31742f5..23ca3a6 100644
--- a/dbus/dbusconfiguration.cpp
+++ b/dbus/dbusconfiguration.cpp
@@ -296,9 +296,9 @@
size_t index = getZoneIndex(name, foundZones);
auto& details = zoneDetailsConfig[index];
- details.minthermalrpm = variant_ns::apply_visitor(
- VariantToDoubleVisitor(), zone.at("MinThermalRpm"));
- details.failsafepercent = variant_ns::apply_visitor(
+ details.minthermalrpm = variant_ns::visit(VariantToDoubleVisitor(),
+ zone.at("MinThermalRpm"));
+ details.failsafepercent = variant_ns::visit(
VariantToDoubleVisitor(), zone.at("FailSafePercent"));
}
auto findBase = configuration.second.find(pidConfigurationInterface);
@@ -394,29 +394,29 @@
}
else
{
- info.setpoint = variant_ns::apply_visitor(
- VariantToDoubleVisitor(), base.at("SetPoint"));
+ info.setpoint = variant_ns::visit(VariantToDoubleVisitor(),
+ base.at("SetPoint"));
}
info.pidInfo.ts = 1.0; // currently unused
- info.pidInfo.p_c = variant_ns::apply_visitor(
- VariantToDoubleVisitor(), base.at("PCoefficient"));
- info.pidInfo.i_c = variant_ns::apply_visitor(
- VariantToDoubleVisitor(), base.at("ICoefficient"));
- info.pidInfo.ff_off = variant_ns::apply_visitor(
+ info.pidInfo.p_c = variant_ns::visit(VariantToDoubleVisitor(),
+ base.at("PCoefficient"));
+ info.pidInfo.i_c = variant_ns::visit(VariantToDoubleVisitor(),
+ base.at("ICoefficient"));
+ info.pidInfo.ff_off = variant_ns::visit(
VariantToDoubleVisitor(), base.at("FFOffCoefficient"));
- info.pidInfo.ff_gain = variant_ns::apply_visitor(
+ info.pidInfo.ff_gain = variant_ns::visit(
VariantToDoubleVisitor(), base.at("FFGainCoefficient"));
- info.pidInfo.i_lim.max = variant_ns::apply_visitor(
+ info.pidInfo.i_lim.max = variant_ns::visit(
VariantToDoubleVisitor(), base.at("ILimitMax"));
- info.pidInfo.i_lim.min = variant_ns::apply_visitor(
+ info.pidInfo.i_lim.min = variant_ns::visit(
VariantToDoubleVisitor(), base.at("ILimitMin"));
- info.pidInfo.out_lim.max = variant_ns::apply_visitor(
+ info.pidInfo.out_lim.max = variant_ns::visit(
VariantToDoubleVisitor(), base.at("OutLimitMax"));
- info.pidInfo.out_lim.min = variant_ns::apply_visitor(
+ info.pidInfo.out_lim.min = variant_ns::visit(
VariantToDoubleVisitor(), base.at("OutLimitMin"));
- info.pidInfo.slew_neg = variant_ns::apply_visitor(
+ info.pidInfo.slew_neg = variant_ns::visit(
VariantToDoubleVisitor(), base.at("SlewNeg"));
- info.pidInfo.slew_pos = variant_ns::apply_visitor(
+ info.pidInfo.slew_pos = variant_ns::visit(
VariantToDoubleVisitor(), base.at("SlewPos"));
}
}
@@ -476,15 +476,13 @@
auto findNegHyst = base.find("NegativeHysteresis");
if (findPosHyst != base.end())
{
- info.stepwiseInfo.positiveHysteresis =
- variant_ns::apply_visitor(VariantToDoubleVisitor(),
- findPosHyst->second);
+ info.stepwiseInfo.positiveHysteresis = variant_ns::visit(
+ VariantToDoubleVisitor(), findPosHyst->second);
}
if (findNegHyst != base.end())
{
- info.stepwiseInfo.positiveHysteresis =
- variant_ns::apply_visitor(VariantToDoubleVisitor(),
- findNegHyst->second);
+ info.stepwiseInfo.positiveHysteresis = variant_ns::visit(
+ VariantToDoubleVisitor(), findNegHyst->second);
}
std::vector<double> readings =
variant_ns::get<std::vector<double>>(base.at("Reading"));