diff options
| author | James Feist <james.feist@linux.intel.com> | 2018-12-06 09:59:10 -0800 |
|---|---|---|
| committer | Patrick Venture <venture@google.com> | 2018-12-06 18:28:56 +0000 |
| commit | 208abce8d8553b7efc1d136fd599d6549d3715a0 (patch) | |
| tree | a02230b4eca3d82d60315d7789778315d1d65057 /dbus | |
| parent | 4cf398618a1eea41205437a6ecceb2911bc13d18 (diff) | |
| download | phosphor-pid-control-208abce8d8553b7efc1d136fd599d6549d3715a0.tar.gz phosphor-pid-control-208abce8d8553b7efc1d136fd599d6549d3715a0.zip | |
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>
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbusconfiguration.cpp | 44 |
1 files changed, 21 insertions, 23 deletions
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 @@ void init(sdbusplus::bus::bus& bus) 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 @@ void init(sdbusplus::bus::bus& bus) } 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 @@ void init(sdbusplus::bus::bus& bus) 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")); |

