summaryrefslogtreecommitdiffstats
path: root/control
diff options
context:
space:
mode:
authorMatthew Barth <msbarth@us.ibm.com>2018-11-06 13:54:46 -0600
committerMatthew Barth <msbarth@us.ibm.com>2018-11-06 13:54:46 -0600
commit8ce4b5f55a93bb074bb28a66bdcb5209ea54880e (patch)
tree3462ccbf9512f66b236bf81491ed3bb62e329e73 /control
parent0420a9324f39c887029a293212f81231b4278b88 (diff)
downloadphosphor-fan-presence-8ce4b5f55a93bb074bb28a66bdcb5209ea54880e.tar.gz
phosphor-fan-presence-8ce4b5f55a93bb074bb28a66bdcb5209ea54880e.zip
Rebase correction (timerPos -> timerConfPos)
Change-Id: I5ab5adcc22f044b3cf0955082061c67f2a281307 Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Diffstat (limited to 'control')
-rw-r--r--control/zone.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/control/zone.cpp b/control/zone.cpp
index 7b19acc..4e8a749 100644
--- a/control/zone.cpp
+++ b/control/zone.cpp
@@ -365,7 +365,7 @@ void Zone::removeEvent(const SetSpeedEvent& event)
}
}
// Remove timers of the event
- if (std::get<intervalPos>(std::get<timerPos>(event)) != seconds(0))
+ if (std::get<intervalPos>(std::get<timerConfPos>(event)) != seconds(0))
{
auto it = findTimer(std::get<groupPos>(event),
std::get<actionsPos>(event));
OpenPOWER on IntegriCloud