From 5d96c27e2679e37bd7354d3c618a4fc3111f137c Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 16 May 2017 12:48:24 +0200 Subject: Fix: compile conversion warning Change-Id: I174c546afb6b21df431e0a61677292d43af8f0ca Signed-off-by: Romain Forlot --- CAN-binder/low-can-binding/utils/timer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CAN-binder') diff --git a/CAN-binder/low-can-binding/utils/timer.cpp b/CAN-binder/low-can-binding/utils/timer.cpp index a7ed558c..3d90a007 100644 --- a/CAN-binder/low-can-binding/utils/timer.cpp +++ b/CAN-binder/low-can-binding/utils/timer.cpp @@ -97,7 +97,7 @@ bool frequency_clock_t::elapsed(bool stagger) last_tick_ = get_time_function()() - (rand() % int(period)); // Make sure it ticks the the first call - elapsed_time = !started() ? period : get_time_function()() - last_tick_; + elapsed_time = !started() ? period : (float)get_time_function()() - (float)last_tick_; return frequency_ == 0 || elapsed_time >= period; } -- cgit 1.2.3-korg