diff options
| -rw-r--r-- | control/zone.cpp | 5 | ||||
| -rw-r--r-- | monitor/tach_sensor.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/control/zone.cpp b/control/zone.cpp index 1ca0465..17ec5fc 100644 --- a/control/zone.cpp +++ b/control/zone.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ #include <chrono> +#include <functional> #include <phosphor-logging/log.hpp> #include <phosphor-logging/elog.hpp> #include <phosphor-logging/elog-errors.hpp> @@ -46,8 +47,8 @@ Zone::Zone(Mode mode, _defCeilingSpeed(std::get<fullSpeedPos>(def)), _incDelay(std::get<incDelayPos>(def)), _decInterval(std::get<decIntervalPos>(def)), - _incTimer(event, [this](){ this->incTimerExpired(); }), - _decTimer(event, [this](){ this->decTimerExpired(); }), + _incTimer(event, std::bind(&Zone::incTimerExpired, this)), + _decTimer(event, std::bind(&Zone::decTimerExpired, this)), _eventLoop(event) { auto& fanDefs = std::get<fanListPos>(def); diff --git a/monitor/tach_sensor.cpp b/monitor/tach_sensor.cpp index de1affb..26ba3c9 100644 --- a/monitor/tach_sensor.cpp +++ b/monitor/tach_sensor.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ #include <experimental/filesystem> +#include <functional> #include <phosphor-logging/log.hpp> #include <phosphor-logging/elog.hpp> #include "fan.hpp" @@ -88,7 +89,7 @@ TachSensor::TachSensor(Mode mode, _offset(offset), _timeout(timeout), _timerMode(TimerMode::func), - _timer(event, [this, &fan](){ fan.timerExpired(*this); }) + _timer(event, std::bind(&Fan::timerExpired, &fan, std::ref(*this))) { // Start from a known state of functional setFunctional(true); |
