diff options
Diffstat (limited to 'control/zone.hpp')
| -rw-r--r-- | control/zone.hpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/control/zone.hpp b/control/zone.hpp index d01e972..9c85655 100644 --- a/control/zone.hpp +++ b/control/zone.hpp @@ -1,14 +1,12 @@ #pragma once +#include <algorithm> #include <cassert> #include <chrono> -#include <vector> -#include <cassert> -#include <algorithm> #include <sdbusplus/bus.hpp> #include <sdeventplus/event.hpp> +#include <vector> #include "fan.hpp" #include "types.hpp" -#include "timer.hpp" namespace phosphor { @@ -423,9 +421,6 @@ class Zone */ inline void removeTimer(std::vector<TimerEvent>::iterator& teIter) { - assert(teIter != std::end(_timerEvents)); - std::get<timerEventDataPos>(*teIter).reset(); - std::get<timerTimerPos>(*teIter).reset(); _timerEvents.erase(teIter); } @@ -547,12 +542,12 @@ class Zone /** * The increase timer object */ - phosphor::fan::util::Timer _incTimer; + Timer _incTimer; /** * The decrease timer object */ - phosphor::fan::util::Timer _decTimer; + Timer _decTimer; /** * Event loop used on set speed event timers |
